BZ 1038713: workaround in order to make the new module dependencies work.
(cherry-picked from bc4bd2d)