Fix regression that broke state restoration on the iPhone
Fix regression that broke state restoration on the iPhone

brentsimmons/Evergreen,brentsimmons/Evergreen,brentsimmons/Evergreen,brentsimmons/Evergreen