Backout 1b5a4a4cf267 (bug 827946) for build breakage on CLOSED TREE.