Backed out changeset 76caa4994120 (bug 506975)
Backed out changeset be4c66d5dc65 (bug 506975) for bc1 test failures