Revert "Merge from master"
Breaks external apps

This reverts commit a47dd4f4aee8918712a48d406b3cfdd3cbd7a690.
Revert "Merge from master"
Breaks external apps

This reverts commit 7c4fbfe919531cdd3d5ac68cb01183317a8c6d80.