i agree, this is terrible, didn't want to touch it though cus it introduces even more sweeping changes.