Switch to a separate saveDeferred() method.