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

This reverts commit 0c429a48624b18ad75a950c06ca90d4a7efa92d3, reversing
changes made to 15cc816723d0709ca6557854e658bb80ae26e3a5.