Backout 4aa280efb6ea (bug 1114745) for various test bustage