Needs updating to hook into new entity storage system
This reverts commit 24b7da65ee. Patch was updated incorrectly and needs a closer look.
24b7da65ee