This reverts commit 8958809f4 and 330054e93. This might need an adjustment to not apply the border change to Windows and Linux.
8958809f4
330054e93