Certificates on some CI systems need to be renewed and the following changes reverted: a0c6eac2, db2ea7b6