Removed OnEntityCreated "temporary" workaround

"Nothing is more permanent than a temporary solution."