Update diff based on RB comments

https://reviews.apache.org/r/9464/

Signed-off-by: David Mackey <tdmackey@twitter.com>
wip

Signed-off-by: David Mackey <tdmackey@twitter.com>