[BZ 1069545] First round for addressing API differences due to this change.