Backing out bug 990074 as we have to backout bug 990685
Backing out bug 990685 as it changes some assumptions for XBL bindings.