diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S
index 2d672dd..665a05e 100644
--- a/bl31/aarch64/bl31_entrypoint.S
+++ b/bl31/aarch64/bl31_entrypoint.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -110,17 +110,13 @@
 	 * caches and participate in coherency.
 	 * --------------------------------------------------------------------
 	 */
-	adrp	x0, __DATA_START__
-	add	x0, x0, :lo12:__DATA_START__
-	adrp	x1, __DATA_END__
-	add	x1, x1, :lo12:__DATA_END__
+	adr	x0, __DATA_START__
+	adr	x1, __DATA_END__
 	sub	x1, x1, x0
 	bl	clean_dcache_range
 
-	adrp	x0, __BSS_START__
-	add	x0, x0, :lo12:__BSS_START__
-	adrp	x1, __BSS_END__
-	add	x1, x1, :lo12:__BSS_END__
+	adr	x0, __BSS_START__
+	adr	x1, __BSS_END__
 	sub	x1, x1, x0
 	bl	clean_dcache_range
 
diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S
index 1619914..51f5b7b 100644
--- a/bl31/aarch64/runtime_exceptions.S
+++ b/bl31/aarch64/runtime_exceptions.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -414,8 +414,7 @@
 	orr	x16, x16, x15, lsl #FUNCID_OEN_WIDTH
 
 	/* Load descriptor index from array of indices */
-	adrp	x14, rt_svc_descs_indices
-	add	x14, x14, :lo12:rt_svc_descs_indices
+	adr	x14, rt_svc_descs_indices
 	ldrb	w15, [x14, x16]
 
 	/* Any index greater than 127 is invalid. Check bit 7. */
diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S
index 86fe236..42227f0 100644
--- a/bl31/bl31.ld.S
+++ b/bl31/bl31.ld.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -208,7 +208,6 @@
      * Define a linker symbol to mark end of the RW memory area for this
      * image.
      */
-    . = ALIGN(PAGE_SIZE);
     __RW_END__ = .;
     __BL31_END__ = .;