backport changes in /provide/ from https://rerelaunch.5apps.com/