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

This reverts commit e948a55589da0739a72a075aed3c24d58a47e5f2, reversing
changes made to 046e469b3ec7098b592b08303fe56e9067a2aa4f.