Revert focus fixes for further improvement
5 files changed