Restore commit 7061c to fix OOPS