Revert last change and test turning off attachment validation