Revert cherry pick w/ upstream

The code doesn't seem well-merged, and has issues anyway. This reverts commit 029a0810a7fe4e7de2e472c605f0a82230163566.