Backed out changeset 689690a17de3 (bug 833143) since the attempt at merging the backout from m-c was lost.