The upgrade is causing failures because of newly deprecated APIs, so it's reverted until we figure out what we want to do exactly for those.
