Revert "Merge remote-tracking branch 'origin/develop' into develop"

This reverts commit 74a439d166c7fa3ed0bba023a6a2325aaa0135ce, reversing
changes made to ef0dc4aaf392cc9af1306c84abdedc18b5343323.