Revert "Merge remote-tracking branch 'upstream/master' into develop"

because my develop CI

This reverts commit 76e5ecf857007e97c42d01c3b488c8cff0708047, reversing
changes made to 2760dbebaf87c4eb68f3ddf32c8edca6e7565819.