@derek why did you remove this? If you want to make this change it should be done in another PR, this is outside of the scope of this one.