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

This reverts commit 52da8ecd48400030ed6e09d9a886a922428888b3, reversing
changes made to 6a56cade6385d065a2abf273e42c0791b45bbbae.
Revert "Initialization."

This reverts commit 6a56cade6385d065a2abf273e42c0791b45bbbae.