Yikes, upstream found a bug in my patch; rel 4