De-listing

Not for merging yet.
This—I don't know where this originated. It isn't mine. I've started this work based on some branch but I'm not sure which.