Revert "Merge branch 'develop'"

This reverts commit b0cbc4bfae3e15c994eeef253a9bf7d426fbe7df, reversing
changes made to 15498348c7d661148061f2dca2a6595ab5206a36.