Revert separator fix, fixes unit test