Revert "Feedback from Duncan"

This reverts commit 9fec87cf20bf22d4e99a287b98e224c7dd46b016.
dont dos2unix this time = messes up the diff