Revert "rebase against upstream master"

This reverts commit 7f4026f9917fb747f972dd899cd59fc15f6aee33.