Backout bug 956218 for build error