This reverts commit 26c7dab9. It appears to break the build on some platforms & causes runtime issues on some devices