ack, can't remember why now. Tests pass with old version, will revert.