Revert "merging in changes from upstream"

This reverts commit 8c0085d529bdbe85bc2ae9512956929cc81c74b8, reversing
changes made to 8b5b1898cb06f12b48ab3411c160462f73d4e231.