Revert 489ddf3..8e48c85

This rolls back to commit 489ddf3df7975766aba7621702bc5f382f1e8038.