Revert "Merge remote-tracking branch 'upstream/develop' into flexbar"

This reverts commit 7dbd1928df408d31b03503daae7b538fd119964d, reversing
changes made to 45163ada515b8eacaef6d70f6ffc8219cc960ca8.