Revert 594ad82..0c26734

This rolls back to commit 594ad82fb7810651b7a7942106cac5bd70100f88.