This reverts commit 6543290116. It broke tests and I don't know why, so reverting this while figuring that out.
6543290116