Revert "Revert "Revert "entity"""

This reverts commit f8c9cc2ee717e121d03de111e7e676a98a0c981d.