This change left a test broken and removed a fair amount of test coverage for unrelated features, and after further discussion it's not clear that this is the direction we want to go in. This reverts commit 6cf2272bbe.
6cf2272bbe