Revert e7fc55e (#35080)
Summary:
resubmit D20464855 and also Fix the broken test due to D20464855
Pull Request resolved: https://github.com/pytorch/pytorch/pull/35080
Differential Revision: D20551174
Pulled By: lly-zero-one
fbshipit-source-id: 5a0547a64365c556c3a677a9512423047497cc85