Revert d8eb696..063c7fe

This rolls back to commit d8eb696a1f32d81a90dd43e0d03d885efd7b89ca.