Submitted patch to fxos-appgen