Also I think this change should have its own PR.