Attempt to debug hang that is hitting some environments. Posting to 1.7.4 as a placeholder for the eventual solution

cmr=v1.7.4:reviewer=rhc