Undo optimization that seems to not be correct in all cases -- will have to evaluate...