BZ 1090453 - internal api change