Revert the Timer.run for focus() calls

It seems to fix the bugs, but breaks the tests. Will need to
come up with an alternative.

Refs #58