This change seems to be unrelated and I'm not sure it should have been included.

@patrik-hagne any comment?