Removed hotfix for v2 pivots