Revert "fix focus bug" - Causes A Ton Of Test Failures

This reverts commit 59a002b2047cce5c555dd8b7c5d0ed24ccfdfab1.