Revert "Merge pull request #412 from terwey/editorScreen"

This reverts commit 9154701d69e7fa14f07e8ba3ee4f7fd029cd610c, reversing
changes made to 3b3de1c6c0c3c8c18f0272aa0daf1b41b6d48bec.