Reapply r130340: Fix for PR9730.