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

This reverts commit 641deb5e3163677a41c5480da6e20367eaa0273b, reversing
changes made to f6d85fa30c23ae2e61725b0dcf272b88518198e1.