Too mani changes to list
Revert "Too mani changes to list"

This reverts commit 73288657123d57ca4a9d98dcdb98b6a9c92900d4.