This reverts commit d2e73ca1abf37eaa65a870851cb8427cb6541131. Even if not cross-platform, this provides useful functionality on Linux and Mac.