This seems like a matter of the legislature reining in law-enforcement whose interpretations have become overly broad, something legislatures (and Congress) also sometimes does to the judicial system.
I agree that it can be cast in an awkward light but it's not uncommon.