Revert "Merge commit '736cc1375f6494e838337119590d8a62c547f135' into develop"

This reverts commit 7513c0c7e0dea4800a58a3c2a15fcb595509e16e, reversing
changes made to 8b3c126af1e9927c27450ab06aeec9f1b579fb57.