Backed out 43e688b70d84 (bug 843667) for compilation failures
CLOSED TREE