diff --git a/dataset_tool.py b/dataset_tool.py
index d8c4dc28..56aa1490 100755
--- a/dataset_tool.py
+++ b/dataset_tool.py
@@ -15,7 +15,8 @@
 import six.moves.queue as Queue # pylint: disable=import-error
 import traceback
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
+tf.disable_v2_behavior()
 import PIL.Image
 import dnnlib.tflib as tflib
 
diff --git a/dnnlib/tflib/optimizer.py b/dnnlib/tflib/optimizer.py
index 9389b5ad..7e71b486 100755
--- a/dnnlib/tflib/optimizer.py
+++ b/dnnlib/tflib/optimizer.py
@@ -8,7 +8,8 @@
 
 import platform
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
+tf.disable_v2_behavior()
 
 from collections import OrderedDict
 from typing import List, Union
diff --git a/dnnlib/tflib/tfutil.py b/dnnlib/tflib/tfutil.py
index 1127c7be..68a0539d 100755
--- a/dnnlib/tflib/tfutil.py
+++ b/dnnlib/tflib/tfutil.py
@@ -8,13 +8,15 @@
 
 import os
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
+tf.disable_v2_behavior()
+
 
 # Silence deprecation warnings from TensorFlow 1.13 onwards
 import logging
 logging.getLogger('tensorflow').setLevel(logging.ERROR)
-import tensorflow.contrib   # requires TensorFlow 1.x!
-tf.contrib = tensorflow.contrib
+#import tensorflow.contrib   # requires TensorFlow 1.x!
+#tf.contrib = tensorflow.contrib
 
 from typing import Any, Iterable, List, Union