This reverts commit 3c8f6c8c (Revert 30816237 and 7e622650, 2010-02-05) as the issue has been sorted out.