This breaks the build on other platforms, so it needs a bit more thought and testing. This reverts commit d0834b34d5.
d0834b34d5