This shouldn't be part of this diff?