Rollback to returning AVector with set