ENG-5212: Re-add deleted comment, per review