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

This reverts commit 753ea4ffd665d91f12e849940846968e67715422, reversing
changes made to 9a3484e55204badd8e29480654a3c6b83b1be2ef.