Switch to using the operation tracker proposed by @alexrodrigues.