Revert patch which broke some IfConversion tests.