Who adds a dirty hack, and doesn't make a regression test?
Created attachment 51207 [details] proposed patch
Committed revision 56338.