Revert "Merge branch 'devel'"

This reverts commit 099b40f07493e7ea4e2cc692bf224d8862b730be, reversing
changes made to 4cfd1f292e421f2e6e2708a1a10da17dc3a38779.