Restore optimization. Re-tested on clean this time.