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

This reverts commit 7ae4b481b941032fcf034208a12bd04325e0d883, reversing
changes made to 6b1f4da537b4453388c77e6d3c9c8f53c2a050bd.