Revert the main portion of r31856. It was causing BranchFolding