Nalin found a (non-security relevant) bug with this patch; see ticket #7881.