Not sure how this fixed the bug #2233, because I put it back and resolved another introduced bug and the other was apparently working.
This closes bug #2250.