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

This reverts commit 8d218a58ce85de6c49da20e5308b573544658644, reversing
changes made to 9a49b6592af45d850740dff4c41521431a0152e4.