Following aocole++'s advice and removing this

The implementation was a hack anyway, using globals. Might redo in the
future, but probably not.