Revert "Merge branch 'develop'"

This reverts commit 0376164a4732c63ac611ea8456e22c078242352d, reversing
changes made to 8943877487ee8d316fd7aedb959244f3f570049a.