Fix remote build + clean up disable feature hack (#21816)
Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/21816
Clean up disable feature hack.
Reviewed By: bddppq
Differential Revision: D15833285
fbshipit-source-id: a2ae5d0f15e47b835dbd3997bbaa0add7e868f20
