Reverting #127

I "fixed" because it wasnt working, but seems to have been related to tester, #695