Back out 693507b38116 (bug 1041180) since it doesn't like compiling without its friend
CLOSED TREE