Revert "Merge branch 'master' into afro"

This reverts commit 3e7f95c0742a4bf9c71e5827124adbdba7a6a815, reversing
changes made to 76964de0ec30c3af9eb89e9f82eeca7f72805051.