This is a problem that literally had minimal societal consequences just a few years ago before the 2018 supreme court ruling[1]. I don't see why we shouldn't just try to move the laws back to how things were in 2017.

Source 1: https://en.wikipedia.org/wiki/Murphy_v._National_Collegiate_...