Co-authored-by: John Bodley <john.bodley@airbnb.com> (cherry picked from commit 82a6811e7e)
82a6811e7e