This change seems unrelated (and undesirable)