Reverts the WithRetries method calls because they didn't solve the exception problem and they cause messages to be delivered twice.
Fixes NullReferenceExceptions that were introduced with the recent debugging help checkin.