[Bug 864397]

Ref: https://bugzilla.mozilla.org/show_bug.cgi?id=864397

Please review