Revert f71bd2e..38cc1dd

This rolls back to commit f71bd2ee3192af21b36c2ef5cffe9f4894f64f73.