Revert "merge from upstream"

This reverts commit c2181edf0ada4b18f5b56479fb38ccf0d7d17966.