Revert "Clean up Entity interface"

This reverts commit 3dab49cf2cf5b9d46d16ab9e4e6c7fa25d62403c.