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