Revert "Merge branch 'refs/heads/master' into DOOG_model_validation"

This reverts commit 8f6f4f18c09ca1d3282477611366792575461bc0, reversing
changes made to 6f562e6a7ab1fcfc37075a95da3506dd4addc77e.