See  bug 931804 and bug 916315. But it was not planned to commit this change in this pull request.