Revert "Fixed descriptor and preparations for lists"

This reverts commit 9f5379fe4722d81631b55b5a5bc77baf5309146c.