This reverts commit 1bde8c76be because of the solution for bug #1320 was causing a new bug #1540.
1bde8c76be