Fixing bug #3632 for good.