Back out e8cd71a4dc0c (bug 915228) for not actually landing all its files
CLOSED TREE