Revert and fix (hopefully)