See FIXME: Do we need this class?