Revert 1c1be04..608f3f2

This rolls back to commit 1c1be048b7bff6341facc056988e948d96d27b72.