Revert r127459, "Optimize trivial branches in CodeGenPrepare, which often get