Issue #2147503 by amateescu: Remove stale reference to the EntityWrapper class.