with the logic in https://github.com/mozilla-b2g/gaia/pull/19334/files#discussion_r13369213, maybe I don't need to modify this section anymore.