Restored previous. Updated. Cite bug #16529.