Restore old code