Is this FIXME still true? maybe the usual return code is ok there?