Bug 22206: (follow-up) Voted RFC changes