Make RemoteEntities dependency actually soft