Make it consistent with nowadays GQ version.
Make it consistent with nowadays GQ version.