Revert part of 3f31e977f7fea9caa6417a58cbf9a4e2804e751c, some code in testing got in there (sorry!)