Same here.  This should just be a step, not some weird helper thing