Revert 57b7656 once we pick up dotnet/core-setup#423 fix

[dougbu]

Similar to aspnet/Mvc#5376 cleanup of the same workaround in MVC.

[dougbu]

@pranavkm should this issue be closed now? Or does some work remain after you pushed 62de4bd?

[pranavkm]

Reverted in 62de4bd

[bricelam]

Thanks, @pranavkm!