Rolling back some parser features.