undo @cauli's change - breaks timings