diff --git a/src/vixl/a64/assembler-a64.cc b/src/vixl/a64/assembler-a64.cc
index 9f85e8f..89b96f0 100644
--- a/src/vixl/a64/assembler-a64.cc
+++ b/src/vixl/a64/assembler-a64.cc
@@ -132,7 +132,10 @@
 CPURegList CPURegList::GetCallerSaved(unsigned size) {
   // Registers x0-x18 and lr (x30) are caller-saved.
   CPURegList list = CPURegList(CPURegister::kRegister, size, 0, 18);
-  list.Combine(lr);
+  // Temporary workaround for bug 21273194: Create a Register object equivalent
+  // to register lr (x30)
+  // list.Combine(lr);
+  list.Combine(Register(30, size));
   return list;
 }