not sure if this addresses the issue, but saner (bug 862902)