Remove unneccessary code introduced with 223101.