Casting No Long Unsheathes Weapon - Is there an option for this?

In 2.1, when I cast stoneskin or cure spells my weapon does not stay out and is never actually considered to be unsheathed. This is a problem for me since my targeting is different when my weapon is sheathed/unsheathed. I know that I can tap L3 to ready my weapon, but that seems to not work as good as it did in 2.0. I don't know if it's some kind of twitch protection (which is nice because I have locked on to bosses when I meant to run away) but it's very finicky now. And since it's what I use to lock on I have to drop and reacquire my target to do it.

Long story short: Is there an option that will change this back to the way it was in 2.0 (where casting any spell unsheathes your weapon)? And if not, can we have the option added in?

This may actually be a bug and not a design change. Seems to be some dungeons.

I only seem to get it in the new dungeons/primals and though I'm only caster dps it's still very annoying. I believe it's a bug as well.

I have noticed it in Ampador Keep, The Wanderer's Palace, and Haukke Manor (Hard Mode). It did NOT happen in Sashsta, Tam-Tara (both level synced) or Gridania.