diff --git a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/WorkflowLayout.kt b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/WorkflowLayout.kt
index 904313ce6..b230ef2c0 100644
--- a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/WorkflowLayout.kt
+++ b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/WorkflowLayout.kt
@@ -252,7 +252,7 @@ public class WorkflowLayout(
 
     constructor(source: Parcel) : super(source) {
       this.childState = if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
-        source.readSparseArray(SavedState::class.java.classLoader, SavedState::class.java)!!
+        source.readSparseArray(SavedState::class.java.classLoader, Parcelable::class.java)!!
       } else {
         @Suppress("DEPRECATION")
         source.readSparseArray(SavedState::class.java.classLoader)!!
diff --git a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ViewStateFrame.kt b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ViewStateFrame.kt
index 5447f134a..ea439918d 100644
--- a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ViewStateFrame.kt
+++ b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ViewStateFrame.kt
@@ -32,10 +32,7 @@ internal data class ViewStateFrame(
     override fun createFromParcel(parcel: Parcel): ViewStateFrame {
       val key = parcel.readString()!!
       val viewState = if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
-        parcel.readSparseArray<Parcelable>(
-          ViewStateFrame::class.java.classLoader,
-          Parcelable::class.java
-        )!!
+        parcel.readSparseArray(ViewStateFrame::class.java.classLoader, Parcelable::class.java)!!
       } else {
         @Suppress("DEPRECATION")
         parcel.readSparseArray<Parcelable>(ViewStateFrame::class.java.classLoader)!!