You guys should consider using this branch

mozilla-hg-148372