This is also a different change, should be in its own commit.