This change seems unrelated, why's this in here?