This reverts commit 08163cd9d8. I accidentally broke the test while addressing review feedback.
08163cd9d8