Aaargh, reverting accidental self-merge

Accidentally merged my own PR. Reverting back ;)