Put back to original

Put things back to how it was earlier since testing for duplicate
within own file is messing up.