Revert "Merge branch 'master' into mox"

This reverts commit 6ac186beea55abb01a06d02d727b60737646e476, reversing
changes made to b35491bfb6aaadd2a7af0dab58bd974c6038d483.