Revert "Work around bug 3422 in trunk"

This reverts commit 987f90f144552e4721fa40295b4f09728f860a7a.

It has been fixed in trunk.