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

This reverts commit d74d347e9a5fe4c813a842f7a1bfef671d4fe642, reversing
changes made to bb709e830d2d714a2540d08f4d4f4063ac80352a.