This reverts commit b21335642e.
b21335642e
Working on Linux, needs verified for other platforms but should be fine.