Revert "Merge branch 'master' into Gabriel's"

This reverts commit 6b00bbf6ddd29a5cc701e2f7d6305f6a3a529663, reversing
changes made to 32be960db5ef466aadf934a0b1db21490428f41d.