De-listing

Not for merging yet.
You can see it reimplemented below.