Revert "Fixed tests that changed as a side-effect of fixing #1016" (346284d7403e1b00d91cf86697af0cdaf2561afa) because it's now done properly
Revert "Pretty horrible fix for #1016" (2ae621dc6cf5e56de2747302f5dcc4b7c19d0d80) because it's now done properly
Now properly fixed #1016, thanks @fromage