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

This reverts commit a8768c39ac60d076f51dc751d879e7c91744e7cb, reversing
changes made to 971581133b622eda1461b974829d338f1e4220b7.