@dschonbe Should we roll back?

No, I think we can fix forward. Just a couple hot patches and we should be OK.