The visa has to be eliminated.
Any modification to the existing H1-B will have immigration attorneys looking for any possible way to exploit any unintended loopholes.
Yet another excellent reasons to cancel these foreign worker visas. They already abuse the program as it is.