Revert ec026a1..e5e609f

This rolls back to commit ec026a13a3ebecd7a0a5fd7570532f775f3bc23c.