Fixed in rev cbbe4cf.  Probably the replacement should be possible in more places too.