diff --git a/cop.h b/cop.h
index f2caeff2d1b..d6dacc9ea95 100644
--- a/cop.h
+++ b/cop.h
@@ -393,9 +393,6 @@ string/length pair.
 
 struct cop {
     BASEOP
-    /* On LP64 putting this here takes advantage of the fact that BASEOP isn't
-       an exact multiple of 8 bytes to save structure padding.  */
-    line_t      cop_line;       /* line # of this command */
     /* label for this construct is now stored in cop_hints_hash */
 #ifdef USE_ITHREADS
     PADOFFSET	cop_stashoff;	/* offset into PL_stashpad, for the
@@ -547,7 +544,7 @@ be zero.
 #define CopLABEL_alloc(pv)	((pv)?savepv(pv):NULL)
 
 #define CopSTASH_ne(c,hv)	(!CopSTASH_eq(c,hv))
-#define CopLINE(c)		((c)->cop_line)
+#define CopLINE(c)		((c)->op_line)
 #define CopLINE_inc(c)		(++CopLINE(c))
 #define CopLINE_dec(c)		(--CopLINE(c))
 #define CopLINE_set(c,l)	(CopLINE(c) = (l))
diff --git a/op.h b/op.h
index 9c05fd75b9a..75d7363a20a 100644
--- a/op.h
+++ b/op.h
@@ -57,7 +57,8 @@ typedef PERL_BITFIELD16 Optype;
     PERL_BITFIELD16 op_typechecked:1;	\
     U8		op_flags;		\
     U8		op_private;             \
-    U8		op_rettype;
+    U8		op_rettype;             \
+    line_t      op_line;       /* line # of this command */
 #endif
 
 /* Class::XSAccessor abuses this */