You can remove this with the above change