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

This reverts commit efd1a6ee75663ab07143a7ab69b4ab2693bf5a0a, reversing
changes made to 82e9ba3e2ec5421705e27748ce2960593a834db1.