Reapply D14078519 (#17596)
Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/17596
Was reverted before, now fixed version.
Reviewed By: ezyang
Differential Revision: D14270288
fbshipit-source-id: c72490b5d02cc6098cb60145fa9a842b3c9a24c5
