Back out bug 807492 for build bustage.
Merge backout.