Would you be okay with landing this with a //FIXME and "see: bug ..." link to indicate our work here is not done yet, but this works dev-wise while we iterate on it?