Restore to old code