Revert 7dbf41c..812caa8

This rolls back to commit 7dbf41cfa073fa4987c464662c78e8b154e975e2.