Comment 7 for bug 1475890

This has been patched and tested. No problems found.