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

This reverts commit f75ffb6f8d6877cf679e115fc2cbbd41a67252b2, reversing
changes made to 2819e02296fb940c2e7c05196115e89f170b7b6e.

reverted from erroneous sync/merge