Roll back experimental focus mode (now on branch)