Revert "Pull in master"

This reverts commit 77baecfb11b3312152b4238a43e9e4921b88350b, reversing
changes made to 48d6a05adce488433e26babb7e73586682ee2caf.