Entities are difficult!
Revert "Entities are difficult!"

This reverts commit 4f19d7706fba9617af72a150bfcc5661b477385e.