Bug 918603 - Address comments review of patch (forgot to fold patch before pushing). r=nbp DONTBUILD