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

This reverts commit 3fd88a787df5b75836c228e393404022eee1a6ed, reversing
changes made to 3fdcec7ae2c36d8bd3ab16373c09b0318ca1b30c.