diff --git a/planetstack/core/models/plcorebase.py b/planetstack/core/models/plcorebase.py
index 782737c..612e925 100644
--- a/planetstack/core/models/plcorebase.py
+++ b/planetstack/core/models/plcorebase.py
@@ -7,6 +7,7 @@
 from django.utils import timezone
 from django.core.exceptions import PermissionDenied
 import model_policy
+from model_autodeletion import ephemeral_models
 
 try:
     # This is a no-op if observer_disabled is set to 1 in the config file
@@ -203,7 +204,7 @@
 
     @classmethod
     def is_ephemeral(cls):
-	return False
+	return cls in ephemeral_models
 
 
 
diff --git a/planetstack/dependency_walker.py b/planetstack/dependency_walker.py
index ca1959e..93e1847 100755
--- a/planetstack/dependency_walker.py
+++ b/planetstack/dependency_walker.py
@@ -79,6 +79,7 @@
 
 			for o in peer_objects:
 				fn(o, object)
+				# Uncomment the following line to enable recursion
 				# walk_inv_deps(fn, o)
 
 def p(x):