Revert "merging changes from upstream"

This reverts commit c4f6d48b9aea4554d0fedcb3bd1b01f98fc38690.