not sure, I just kept the previous code here but I think that is not needed as you think

https://github.com/mozilla-b2g/gaia/pull/16366/files#diff-7750b45f6dac9b270da2e2b542517e43L21