Changes just checked in today to deal with this, at least in most cases.