Revert "Merge branch 'master' into afro"

This reverts commit 3e7f95c0742a4bf9c71e5827124adbdba7a6a815, reversing
changes made to d07f23aaeaa2c74d99729f90f68e060127edd4b6.
Revert "Revert "Merge branch 'master' into afro""

This reverts commit fd8838958e3ba6dd2e55ff7fad610cd5e0e74e03.