Revert "Merge commit 'pull/origin/252' into devel"

This reverts commit ff55e86a4268e3c63a6573162ecbb4afa103908e, reversing
changes made to da91c9c071f56a2b48e5be880e2f13f1076eee0e.