Undoing hack in prep. for work queue.