Fix yet another FIXME.