Revert r38149 for now, causes regressions in API parsing.