Make queue flushing work with deferred explicit change tracking policy
As per 622f38a