Bug 8092 follow-up: Add optional dependency on CHI