I can change this, but it will break a bunch of tests. Therefore, I would prefer to do it separately.