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

This reverts commit 3fbd55c3cd5e1e8eaf18f6e44cfef214371125be, reversing
changes made to 88953da24f6a7b235abc31f2db7e56540e68e681.