These changes look unrelated to me; should this be in a different PR?