SCHEMA-142. update with api change.
over-the-shoulder review: Lee Sheng