LPS-43773 I think that we don't need because we are doing substring later and we are not getting the extension, so we don't need to strip it?

Hey @jonathanmccann 

Can you please test my changes? 
If they all look good please fwd it to Brian.

thx!