This reverts commit a878c3056d. The previous stuff that this builds on didn't successfully land fully. Since I want to measure this in isolation, I'll revert this for now.
a878c3056d