Bug 825605 Avoid explicitly setting null as that actually sets the string 'null' r=Mnyromyr