retargeting PR#26 for mozsvc dev