Revert r39949 "* Revert revert r39662 of my parser changes."