Remove usage of rewire.
Merge pull request #1627 from rwjblue/remove-rewire

Remove usage of rewire.