Bug 861887 Review comments for prev patch r=bholley

--HG--
extra : rebase_source : 7f91680f5f7249c9fb09708eb790bdc19c779c67