Revert "Merge pull request #232 from Priskvark/master"
Breaks external apps

This reverts commit 263742abecfabf254b340ad28a26b34ba8f47609, reversing
changes made to b5b9bb36e64e10701474475daf13c107bfb5e769.