Revert "Merge branch 'master' into ubuntu"

This reverts commit 45d4c96c7b05ebcb02a86aba329ea5f520d8e7cd, reversing
changes made to 1abad23f95f7d0b60a266b68b464bff34c8a3f2e.