Bug 8268 follow-up: rewrite config correctly