Bug 893830 - Followup based on feedback: output both forms by default. r=gps DONTBUILD