So, let's make it a void. Patch forthcoming.
Created attachment 27826 [details] proposed patch
Committed revision 41130.