Undo "smart" optimization change that breaks mode parsing.