diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultAsyncAtomicCounter.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultAsyncAtomicCounter.java
index 7ff6b89..8a9f884 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultAsyncAtomicCounter.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultAsyncAtomicCounter.java
@@ -16,15 +16,9 @@
 package org.onosproject.store.consistent.impl;
 
 import org.onosproject.store.service.AsyncAtomicCounter;
-import org.slf4j.Logger;
 
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiFunction;
-
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
 
 /**
  * Default implementation for a distributed AsyncAtomicCounter backed by
@@ -36,11 +30,6 @@
 
     private final String name;
     private final Database database;
-    private final boolean retryOnFailure;
-    private final ScheduledExecutorService retryExecutor;
-    // TODO: configure delay via builder
-    private static final int DELAY_BETWEEN_RETRY_SEC = 1;
-    private final Logger log = getLogger(getClass());
     private final MeteringAgent monitor;
 
     private static final String PRIMITIVE_NAME = "atomicCounter";
@@ -52,13 +41,9 @@
 
     public DefaultAsyncAtomicCounter(String name,
                                      Database database,
-                                     boolean retryOnException,
-                                     boolean meteringEnabled,
-                                     ScheduledExecutorService retryExecutor) {
+                                     boolean meteringEnabled) {
         this.name = checkNotNull(name);
         this.database = checkNotNull(database);
-        this.retryOnFailure = retryOnException;
-        this.retryExecutor = retryExecutor;
         this.monitor = new MeteringAgent(PRIMITIVE_NAME, name, meteringEnabled);
     }
 
@@ -86,77 +71,14 @@
     @Override
     public CompletableFuture<Long> getAndAdd(long delta) {
         final MeteringAgent.Context timer = monitor.startTimer(GET_AND_ADD);
-        CompletableFuture<Long> result = database.counterGetAndAdd(name, delta);
-        if (!retryOnFailure) {
-            return result
-                    .whenComplete((r, e) -> timer.stop());
-        }
-
-        CompletableFuture<Long> future = new CompletableFuture<>();
-        return result.whenComplete((r, e) -> {
-            timer.stop();
-            // TODO : Account for retries
-            if (e != null) {
-                log.warn("getAndAdd failed due to {}. Will retry", e.getMessage());
-                retryExecutor.schedule(new RetryTask(database::counterGetAndAdd, delta, future),
-                        DELAY_BETWEEN_RETRY_SEC,
-                        TimeUnit.SECONDS);
-            } else {
-                future.complete(r);
-            }
-        }).thenCompose(v -> future);
+        return database.counterGetAndAdd(name, delta)
+                       .whenComplete((r, e) -> timer.stop());
     }
 
     @Override
     public CompletableFuture<Long> addAndGet(long delta) {
         final MeteringAgent.Context timer = monitor.startTimer(ADD_AND_GET);
-        CompletableFuture<Long> result = database.counterAddAndGet(name, delta);
-        if (!retryOnFailure) {
-            return result
-                    .whenComplete((r, e) -> timer.stop());
-        }
-
-        CompletableFuture<Long> future = new CompletableFuture<>();
-        return result.whenComplete((r, e) -> {
-            timer.stop();
-            // TODO : Account for retries
-            if (e != null) {
-                log.warn("addAndGet failed due to {}. Will retry", e.getMessage());
-                retryExecutor.schedule(new RetryTask(database::counterAddAndGet, delta, future),
-                        DELAY_BETWEEN_RETRY_SEC,
-                        TimeUnit.SECONDS);
-            } else {
-                future.complete(r);
-            }
-        }).thenCompose(v -> future);
-    }
-
-    private class RetryTask implements Runnable {
-
-        private final BiFunction<String, Long, CompletableFuture<Long>> function;
-        private final Long delta;
-        private final CompletableFuture<Long> result;
-
-        public RetryTask(BiFunction<String, Long, CompletableFuture<Long>> function,
-                Long delta,
-                CompletableFuture<Long> result) {
-            this.function = function;
-            this.delta = delta;
-            this.result = result;
-        }
-
-        @Override
-        public void run() {
-            function.apply(name, delta).whenComplete((r, e) -> {
-                if (e == null) {
-                    result.complete(r);
-                } else {
-                    log.warn("{} retry failed due to {}. Will try again...", function, e.getMessage());
-                    // TODO: Exponential backoff
-                    // TODO: limit retries
-                    retryExecutor.schedule(this, DELAY_BETWEEN_RETRY_SEC, TimeUnit.SECONDS);
-                }
-            });
-        }
+        return database.counterAddAndGet(name, delta)
+                       .whenComplete((r, e) -> timer.stop());
     }
 }
\ No newline at end of file