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

This reverts commit 84ab9b36521e9bdee5806777050fdcbdd05b492e, reversing
changes made to cfb922e6514db558a97dec5312c9c8529428456e.