Revert "Merge branch 'revert-lists' into 'master'", i.e. merge list feature on master again
This reverts commit 7b8bc0df, reversing changes made to afb36ef8.