This reverts commit 7520d187. The pre-commit patch that was supposed to NFC add tests for this patch picked up some code that should not be here. I'll clean up and re-commit.
