Should this TODO [Hack] be removed now?