Revert some beta bleeding edge dependencies