Revert fix for Google Code issue 296, as the fix for Google Code issue
305 also fixes this problem, but then in a better way.