Revert stupid dependency fixes.