[BZ #2625]