Revert "workaround for [2113743] Sholes: frozen then runtime restart going to list view"
This reverts commit 4a06bb4f33.
Revert "workaround for [2113743] Sholes: frozen then runtime restart going to list view"
This reverts commit 4a06bb4f33.