back out cb015c10d58f (bug 828508) on a CLOSED TREE for turning bc tests orange