Unrelated issues. Partial revert