Backed out changeset 512ef66a96b8 (bug 650161)
Backed out changeset 6f0a56999e9b (bug 650161)
Backed out changeset bea8bb703913 (bug 650161) for rooting hazzard failures