Revert "Fix freezing on ST2/3 on Windows, ST3 on OS X"

This reverts commit 49f095667fd993f691706b50e04945aad0f20ae5.