Put this code back in until the focus updates in #1048 are merged.