Sounds a good reason to go after your representatives to fix it right now!
Yes, that as well. It's best to have a multilayered approach to this.