Reinstatement of the old code