De-listing

Not for merging yet.
I guess I would have to change it back to "punt".