Revert "Fix kf counters in fwd kf"

This reverts commit 927505150ff5054495e89ea2eb08f5febaedad7a.

BUGS=aomedia:3072

Change-Id: I463ccaaa272a2f5a1ac78068cb7580b63d1e3a3a

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 81b24c6..01f2959 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -138,8 +138,7 @@
 }
 
 static INLINE void update_keyframe_counters(AV1_COMP *cpi) {
-  if (cpi->common.show_frame &&
-      (cpi->rc.frames_to_key || cpi->oxcf.kf_cfg.fwd_kf_enabled)) {
+  if (cpi->common.show_frame && cpi->rc.frames_to_key) {
     cpi->rc.frames_since_key++;
     cpi->rc.frames_to_key--;
   }