Once you've submitted an upstream issue about this (and the bit below, same issue)  then link it in the commit above the inreplace and I'm happy for this to get merged.