Reverting a change

Reverted a previous change relating to #211 the way that I did it would
just cause more problems than the toggle does, I feel it would be wrong
to leave it in there