Revert "Allow entities to be stored in maps"

This reverts commit fbb4e9f2b51a7b8f84935a9d44a643e6865a1e37.