Wasn't a huge fan of putting the burden on the user.  Just remove it and
do what we've got to do transparently.