Restoring some lost code.