Patch forthcoming.
Created attachment 41133 [details] proposed fix
Comment on attachment 41133 [details] proposed fix *sigh*
Committed revision 49525.