Revert f9d3ee8..65b23dc

This rolls back to commit f9d3ee85f24a06def6879aff1f95547ae7d2d91c.