Revert the switch lowering change (r235101, r235103, r235106)