Revert unintentionally reintroduced idx