Reverts wrong modification to MachineBlockPlacement & BranchFolding; uses a new strat...