Why include this change here?  Seems unrelated.