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

This reverts commit 3d243c99d86aa367de451a0fb77eae63528832aa, reversing
changes made to 59095e1ffefd4d8b8c2730c747996364fb1629c1.