Undoing the commit 92872e72ecbe89862baa55fc737da16bb272612a: it wasn't an optimization!