De-listing

Not for merging yet.
Generally, I would prefer to push this functionality change to another issue. Otherwise, it could potentially delay #320.