Revert "merge from upstream/develop"

This reverts commit 2f3b3da6ade6b2c0a4981d87a8752e5aeab19f81, reversing
changes made to 99368584b4b8c00c8df02432c8060e60e56d7c65.