Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 15dbcfa0e86f24cb8169fcfc40a49b11f0bf4ad7, reversing
changes made to 7fb1c1781af8160bda9e16646a71956f492ed6e9.