I can take care of this switch, and I can place a bottle build for Linux and macOS onto S3 later today. The PR will need to be rebased onto master for the FreeBSD change and I will post in the PR the bottle hashes.