revert extra-space handling until we can look at better characters/solutions