This reverts commit 1a6fe946ce. This is going to break the regression tests, so reverting it for now.
1a6fe946ce