The previous patch should work in most cases, but this should
work more reliably and the comment is more clear
bug 1196