Fix issue with bundle update retry logic not being honored