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

This reverts commit f54e426206044d438f159a13552e060fa2c9c6f0, reversing
changes made to 0c42fb9712f553f346c45db46f570eddfdb70905.