Backout bug 956218 for link error.