Revert "[saxon-upgrade] ...."

This reverts commit b5b4e8954796c8f71544b55b525ea0fb33578024.
Revert "[saxon-upgrade] second road first steps"

This reverts commit 7b67cd8bb8e850410c1cd65da64592d12a36692e.