Reverting #127

I "fixed" because it wasnt working, but seems to have been related to tester, #695
Merge pull request #1023 from sjs/patch-4

Reverting #127