Revert changes. Just deal with the weirdness another way