revert border styling perf change and merge official fix from CodeMirror upstream master
Merge pull request #3805 from adobe/jasonsanjose/revert-pull-3767

Revert border styling perf change and merge official fix from CodeMirror upstream/master