Revert 80e531a..210f0f6

This rolls back to commit 80e531a935b5714159ebf972baf2de82f5a30a89.