Update hook change based on PR review feedback.  #2807