Rolling back the new model. It turns out it isn't as needed as I thought.