Sorry, wrong patch. Here's the patch I meant in #3.