diff --git a/src/arch/aarch64/exceptions.S b/src/arch/aarch64/exceptions.S
index 0765b8b..0f06bdd 100644
--- a/src/arch/aarch64/exceptions.S
+++ b/src/arch/aarch64/exceptions.S
@@ -306,11 +306,7 @@
 	stp x24, x25, [x1, #VCPU_LAZY + 16 * 12]
 
 	mrs x26, vttbr_el2
-	mrs x27, cntv_cval_el0
-	stp x26, x27, [x1, #VCPU_LAZY + 16 * 13]
-
-	mrs x28, cntv_ctl_el0
-	str x28, [x1, #VCPU_LAZY + 16 * 14]
+	str x26, [x1, #VCPU_LAZY + 16 * 13]
 
 	/* Save new vcpu pointer in non-volatile register. */
 	mov x19, x0
@@ -379,12 +375,8 @@
 	msr cptr_el2, x24
 	msr cnthctl_el2, x25
 
-	ldp x26, x27, [x0, #VCPU_LAZY + 16 * 13]
+	ldr x26, [x0, #VCPU_LAZY + 16 * 13]
 	msr vttbr_el2, x26
-	msr cntv_cval_el0, x27
-
-	ldr x28, [x0, #VCPU_LAZY + 16 * 14]
-	msr cntv_ctl_el0, x28
 
 	/* Restore non-volatile registers. */
 	ldp x19, x20, [x0, #VCPU_REGS + 8 * 19]
diff --git a/src/arch/aarch64/inc/hf/arch/types.h b/src/arch/aarch64/inc/hf/arch/types.h
index fdc55ab..e028adc 100644
--- a/src/arch/aarch64/inc/hf/arch/types.h
+++ b/src/arch/aarch64/inc/hf/arch/types.h
@@ -40,6 +40,7 @@
 	uintreg_t pc;
 	uintreg_t spsr;
 
+	/* TODO: We need to save virtual timer state. */
 	struct {
 		uintreg_t vmpidr_el2;
 		uintreg_t csselr_el1;
@@ -68,7 +69,5 @@
 		uintreg_t cptr_el2;
 		uintreg_t cnthctl_el2;
 		uintreg_t vttbr_el2;
-		uintreg_t cntv_cval_el0;
-		uintreg_t cntv_ctl_el0;
 	} lazy;
 };