addressing review https://reviews.apache.org/r/12960/diff/1/