This reverts commit e13248ab. Need to revert because the transformation cannot occur for basic blocks that contain convergent instructions.