rolled back a change that made a test fail, and needs a bit more thought