Comment 7 for bug 871544

Additional improvement to patch.