Fix for upstream change c0db9c23e307a000af5e8fed6960ccd55c0e3a38