Revert "Merge branch 'master' into horus"

This reverts commit 506c5ca92e455e5fd4806d2e6fd215cf52d092e6, reversing
changes made to 2761b1307b91e962271938b06981d8b0b73d6d98.