Revert "Issue #1272840 follow-up by Dave Reid: Fixed broken upgrade path for language domains and validation." This reverts commit 91d6b144.