[BZ 1069545] Updates to the API change.