Revert "Merge branch 'devel'"

This reverts commit 2c6a9929d0a05bfa71c6e66f1dc0d202b558f34d, reversing
changes made to 63d2216df9d54bc7b612649fe568f8fbbea85deb.