Revert "fix bug 337586: first try"

This reverts commit f0c5bba259c6037346cf34f3c46bead82a2f7f59.