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

This reverts commit 1c84ba1e4ec15e4ab5e3c082de5654b5eef41e2e, reversing
changes made to bd9a566b0dc744ab0e3d748a0140a1e1a76d1a8c.