That commit causes crashes on Windows and OSX (and likely anything that isn't X11). This reverts commit 23de02b8.