Revert "upstream changes"

This reverts commit 0c184a4d209ac16305e2c2864404087b4ce1eecf.