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

This reverts commit 06486b5cc2071d2d070be8aa34efb11d9192369d, reversing
changes made to 6e4016e0197ab8f25db05d0e61e3a422e46bd334.