Patch forthcoming.
I'm just going to do the right thing in the initial patch. *** This bug has been marked as a duplicate of bug 150280 ***