Backed out changeset d38a000208e9 (bug 865361) for talos bustage.
CLOSED TREE