Core/Entities: revert code that should not have been removed. Must be more careful using automation