#6: undo tentative performance fix