Revert "* Try to reverse logic, preventing to have extra sanity checks."

This reverts commit dc63ceea76979822093c2ec1c0b5dc5db64917e5.