Comment 9 for bug 514401

Just in case, here is a patch to do further testing/etc.