diff --git a/src/gfxstream/codegen/scripts/cereal/decoder.py b/src/gfxstream/codegen/scripts/cereal/decoder.py
index e4ddcc3987e..17de79d5b6f 100644
--- a/src/gfxstream/codegen/scripts/cereal/decoder.py
+++ b/src/gfxstream/codegen/scripts/cereal/decoder.py
@@ -831,9 +831,6 @@ size_t VkDecoder::Impl::decode(void* buf, size_t len, IOStream* ioStream,
         self.cgen.stmt("unsigned char *ptr = (unsigned char *)buf")
         self.cgen.stmt("const unsigned char* const end = (const unsigned char*)buf + len")
 
-        self.cgen.beginIf("m_forSnapshotLoad")
-        self.cgen.stmt("ptr += m_state->setCreatedHandlesForSnapshotLoad(ptr)");
-        self.cgen.endIf()
         self.cgen.line("while (end - ptr >= 8)")
         self.cgen.beginBlock() # while loop
 
@@ -982,10 +979,6 @@ size_t VkDecoder::Impl::decode(void* buf, size_t len, IOStream* ioStream,
         self.cgen.stmt("vkStream->clearPool()")
         self.cgen.endBlock() # while loop
 
-        self.cgen.beginIf("m_forSnapshotLoad")
-        self.cgen.stmt("m_state->clearCreatedHandlesForSnapshotLoad()");
-        self.cgen.endIf()
-
         self.cgen.stmt("m_pool.freeAll()")
         self.cgen.stmt("return ptr - (unsigned char*)buf;")
         self.cgen.endBlock() # function body
diff --git a/src/gfxstream/codegen/scripts/cereal/decodersnapshot.py b/src/gfxstream/codegen/scripts/cereal/decodersnapshot.py
index ef2273b2874..b67612f14b6 100644
--- a/src/gfxstream/codegen/scripts/cereal/decodersnapshot.py
+++ b/src/gfxstream/codegen/scripts/cereal/decodersnapshot.py
@@ -33,8 +33,8 @@ class VkDecoderSnapshot {
 
     void clear();
 
-    void saveDecoderReplayBuffer(android::base::Stream* stream);
-    static void loadDecoderReplayBuffer(android::base::Stream* stream, std::vector<uint8_t>* outBuffer);
+    void saveReplayBuffers(android::base::Stream* stream);
+    static void loadReplayBuffers(android::base::Stream* stream, std::vector<uint64_t>* outHandleBuffer, std::vector<uint8_t>* outDecoderBuffer);
 
     VkSnapshotApiCallInfo* createApiCallInfo();
     void destroyApiCallInfoIfUnused(VkSnapshotApiCallInfo* info);
@@ -68,13 +68,13 @@ class VkDecoderSnapshot::Impl {
         mReconstruction.clear();
     }
 
-    void saveDecoderReplayBuffer(android::base::Stream* stream) {
+    void saveReplayBuffers(android::base::Stream* stream) {
         std::lock_guard<std::mutex> lock(mReconstructionMutex);
-        mReconstruction.saveDecoderReplayBuffer(stream);
+        mReconstruction.saveReplayBuffers(stream);
     }
 
-    static void loadDecoderReplayBuffer(android::base::Stream* stream, std::vector<uint8_t>* outBuffer) {
-        VkReconstruction::loadDecoderReplayBuffer(stream, outBuffer);
+    static void loadReplayBuffers(android::base::Stream* stream, std::vector<uint64_t>* outHandleBuffer, std::vector<uint8_t>* outDecoderBuffer) {
+        VkReconstruction::loadReplayBuffers(stream, outHandleBuffer, outDecoderBuffer);
     }
 
     VkSnapshotApiCallInfo* createApiCallInfo() {
@@ -101,13 +101,13 @@ void VkDecoderSnapshot::clear() {
     mImpl->clear();
 }
 
-void VkDecoderSnapshot::saveDecoderReplayBuffer(android::base::Stream* stream) {
-    mImpl->saveDecoderReplayBuffer(stream);
+void VkDecoderSnapshot::saveReplayBuffers(android::base::Stream* stream) {
+    mImpl->saveReplayBuffers(stream);
 }
 
 /*static*/
-void VkDecoderSnapshot::loadDecoderReplayBuffer(android::base::Stream* stream, std::vector<uint8_t>* outBuffer) {
-    VkDecoderSnapshot::Impl::loadDecoderReplayBuffer(stream, outBuffer);
+void VkDecoderSnapshot::loadReplayBuffers(android::base::Stream* stream, std::vector<uint64_t>* outHandleBuffer, std::vector<uint8_t>* outDecoderBuffer) {
+    VkDecoderSnapshot::Impl::loadReplayBuffers(stream, outHandleBuffer, outDecoderBuffer);
 }
 
 VkSnapshotApiCallInfo* VkDecoderSnapshot::createApiCallInfo() {