I see, and like we said in https://github.com/mozilla-b2g/gaia/pull/16798#discussion_r10390166, let's leave it as it is with current fix and apply new refactoring in bug 936729.