Revert "Merge branch 'master' into releases/1.3.0"

This reverts commit 4e696e6f14f76cb12e40887696ba6d168ad7bc83, reversing
changes made to 9c0c6aa2308b12d86e31ce20ea751f4cf345c7e2.