BZ-8787: Fixing build.