bug 842661 reverting back to old change