Added back unnecessary code removal.