Revert "Changed data error detection"

This reverts commit 003ea9bb7e6c26cc6cfa378fce0c2dd7b92d455d.