Revert "Major module upgrades."

This reverts commit 2e7bc4fb0efd4605fea6a3afd5b4260699c87a84.