Fix for #1671 - Adding [FromHeader] attribute

I thought we are fixing this before this goes in