Bug 828955 - helper design is messed up

Bug [#828955](https://bugzilla.mozilla.org/show_bug.cgi?id=828955)