diff --git a/core/src/main/java/edu/umd/cs/piccolo/PCamera.java b/core/src/main/java/edu/umd/cs/piccolo/PCamera.java
index 6604b4a..af1def3 100644
--- a/core/src/main/java/edu/umd/cs/piccolo/PCamera.java
+++ b/core/src/main/java/edu/umd/cs/piccolo/PCamera.java
@@ -356,7 +356,7 @@
         paintCameraView(paintContext);
         paintDebugInfo(paintContext);
 
-        paintContext.popTransform();
+        paintContext.popTransform(viewTransform);
         paintContext.popClip(getBoundsReference());
     }
 
diff --git a/core/src/main/java/edu/umd/cs/piccolo/PNode.java b/core/src/main/java/edu/umd/cs/piccolo/PNode.java
index 0fe5efe..ec6b9a4 100644
--- a/core/src/main/java/edu/umd/cs/piccolo/PNode.java
+++ b/core/src/main/java/edu/umd/cs/piccolo/PNode.java
@@ -2818,7 +2818,7 @@
             paintAfterChildren(paintContext);
 
             paintContext.popTransparency(transparency);
-            paintContext.popTransform();
+            paintContext.popTransform(transform);
         }
     }
 
diff --git a/core/src/main/java/edu/umd/cs/piccolo/util/PPaintContext.java b/core/src/main/java/edu/umd/cs/piccolo/util/PPaintContext.java
index 33146f8..505fe96 100644
--- a/core/src/main/java/edu/umd/cs/piccolo/util/PPaintContext.java
+++ b/core/src/main/java/edu/umd/cs/piccolo/util/PPaintContext.java
@@ -244,7 +244,6 @@
      * Pops the topmost Transform from the top of the transform if the passed in
      * transform is not null.
      * 
-     * @deprecated in favor of popTransform()
      * @param aTransform transform that should be at the top of the stack
      */
     public void popTransform(final PAffineTransform aTransform) {
@@ -252,17 +251,7 @@
             graphics.setTransform((AffineTransform) transformStack.pop());
             localClipStack.pop();
         }
-    }
-
-    /**
-     * Pops the topmost Transform from the top of the transform stack, or does nothing if it's empty.
-     */
-    public void popTransform() {
-        if (!transformStack.isEmpty()) {
-            graphics.setTransform((AffineTransform) transformStack.pop());
-            localClipStack.pop();
-        }
-    }
+    }   
 
     /**
      * Return the render quality used by this paint context.