Use ship-it instead of +/-1.

Reviewed at https://reviews.apache.org/r/27188/