BZ-10426 restored