This should be tagged with a FIXME pointing at 9913, right?