Revert "Merge branch 'develop' into MLS"

This reverts commit 2c0082bc0395b6a2bd52a98a318c2a95c0c82783, reversing
changes made to a5fdd3114797065e353b4b3f4d54b2ccbf3ba22b.