(#4494)  OK, so that fix was seriously broken.