Forgot to attach the patch I mentioned.