Seems like this change shouldn't go in this PR?