Is this FIXME still relevant?