Fix bug 3219, again.