Revert "some additions to #49929695"

This reverts commit fcd20fb792c8656b2227e42077f75f65e3d9f502.