This reverts commit 0aefafa7f777157776084db846240dd027b81fe3. This does not work since the API goes away during the transition. References #72
References #72
Closes #79