Reverted entity registry changes until I can get it stable again.