Revert "Flag switch to invalid screen during development."

This reverts commit 1622edc3d00c4a2b6eec3183b4123fe3bf2ed8e2.