Revert unify hack :), FIXME