diff --git a/PIL/ImageFile.py b/PIL/ImageFile.py
index 52c2ed34c..a56795751 100644
--- a/PIL/ImageFile.py
+++ b/PIL/ImageFile.py
@@ -243,12 +243,6 @@ class ImageFile(Image.Image):
             # still raised if decoder fails to return anything
             raise_ioerror(err_code)
 
-        # post processing
-        if hasattr(self, "tile_post_rotate"):
-            # FIXME: This is a hack to handle rotated PCD's
-            self.im = self.im.rotate(self.tile_post_rotate)
-            self.size = self.im.size
-
         self.load_end()
 
         return Image.Image.load(self)
diff --git a/PIL/PcdImagePlugin.py b/PIL/PcdImagePlugin.py
index b53635a99..24186bcfc 100644
--- a/PIL/PcdImagePlugin.py
+++ b/PIL/PcdImagePlugin.py
@@ -42,8 +42,9 @@ class PcdImageFile(ImageFile.ImageFile):
             raise SyntaxError("not a PCD file")
 
         orientation = i8(s[1538]) & 3
+        self.tile_post_rotate = None
         if orientation == 1:
-            self.tile_post_rotate = 90  # hack
+            self.tile_post_rotate = 90
         elif orientation == 3:
             self.tile_post_rotate = -90
 
@@ -51,6 +52,13 @@ class PcdImageFile(ImageFile.ImageFile):
         self.size = 768, 512  # FIXME: not correct for rotated images!
         self.tile = [("pcd", (0, 0)+self.size, 96*2048, None)]
 
+    def load_end(self):
+        if self.tile_post_rotate:
+            # Handle rotated PCDs
+            self.im = self.im.rotate(self.tile_post_rotate)
+            self.size = self.im.size
+
+
 #
 # registry