Revert "Update to latest versions"

Apparently this didn't work as expected and needs additional testing

This reverts commit 285975404aa0836f67e046f39d76599a5d81fafe.