Entity again
Revert "Entity again"

This reverts commit ef884fa12de2cc2cccbd397860ff70bfdd3cfbdd.