Revert f3be9f3..b627c09

This rolls back to commit f3be9f369383bda5d9c8df5ba973006893176e5c.