Revert "Merge remote-tracking branch 'upstream/devel' into devel"

This reverts commit 9864c5843af7fe395581701d388069864cd25643, reversing
changes made to 2d0d5254218b03606812a41eca92830d65af3f13.