Bring back some needed code.