85041962 whsc email

That was a non-sequitur... feel free to make a separate story/PR.