revert incoming changes from sparqueue
correctly handle formatting object
--upgrade should be unnecessary