Reverted merge with fix-gram-config-space