This solves problem reported privately by Thomas Klausner, where the regress test would take very very long to complete.