Bug 898554 - Spot fix some path breakage due to part of a later patch (fallback manifests) sneaking in

I may not land that later patch after all.

--HG--
extra : rebase_source : f991ca908bf5c9216c1ee0dbd43a9cbb01ff3ba2