Given that the majority of uses won't need this, it'd be good to only require it when we actually need it.