Revert "Upgrading a few more modules."

This reverts commit f2b886403623c08601746ee822439583da3aaf2c.