Undoing an untested regression. testing to come...