Back out dc76402b8471 (bug 844288) on suspicion of breaking dep builds
CLOSED TREE
Merge birch to m-c.