Although unrelated to #1516, this broken test case is causing headaches. (This is a reasonable fix in any case.)