This reverts commit 2a3fdf6b64, reversing changes made to a06145d781.
2a3fdf6b64
a06145d781
This allows it to be bundled in the distributed app more simply