Revert "Merge branch 'develop' into custom"

This reverts commit 2a1375760127dc27a2cfb09def4687d201b57e67, reversing
changes made to 439c8ee9ca6562289c6ed2215f904581874da7fa.