Mike Lee and his cohorts in Utah for years have been trying to do this. He's pushing hard right now because the political climate is favorable with slim majorities in the house and senate leading to lots of deal making. He is not to be trusted and I'm sure any changes he might make will be cosmetic lip service. Can't let up the pressure until this is totally dropped from the bill.
