Revert r40953 '(bug 7509) Don't hardcode separation strings, make them configurable'