Reverting fix for bug 973718