This reverts commit 49c2a4a4e3. The validation was causing more problems than it was fixing, so removed it completely
49c2a4a4e3