Fix incremental saving with hybrid references

[calixteman]

This patch removes some previous fixes which are now likely fixed by #17636.

Fixes #20302.

[calixteman]

/botio test

[moz-tools-bot]

From: Bot.io (Linux m4)

---

Received

Command cmd_test from @calixteman received. Current queue size: 0

Live output at: http://54.241.84.105:8877/d4a3af10ea8c632/output.txt

[moz-tools-bot]

From: Bot.io (Windows)

---

Received

Command cmd_test from @calixteman received. Current queue size: 0

Live output at: http://54.193.163.58:8877/6fa5eb7d79db74e/output.txt

[moz-tools-bot]

From: Bot.io (Linux m4)

---

Success

Full output at http://54.241.84.105:8877/d4a3af10ea8c632/output.txt

Total script time: 38.57 mins

• Unit tests: Passed
• Integration Tests: Passed
• Regression tests: Passed

[moz-tools-bot]

From: Bot.io (Windows)

---

Failed

Full output at http://54.193.163.58:8877/6fa5eb7d79db74e/output.txt

Total script time: 77.80 mins

• Unit tests: FAILED
• Integration Tests: Passed
• Regression tests: Passed

[calixteman]

/botio unittest

[moz-tools-bot]

From: Bot.io (Linux m4)

---

Received

Command cmd_unittest from @calixteman received. Current queue size: 0

Live output at: http://54.241.84.105:8877/5bf01d5e440330d/output.txt

[moz-tools-bot]

From: Bot.io (Windows)

---

Received

Command cmd_unittest from @calixteman received. Current queue size: 0

Live output at: http://54.193.163.58:8877/810d5990eb46a4c/output.txt

[moz-tools-bot]

From: Bot.io (Linux m4)

---

Success

Full output at http://54.241.84.105:8877/5bf01d5e440330d/output.txt

Total script time: 2.43 mins

• Unit Tests: Passed

[moz-tools-bot]

From: Bot.io (Windows)

---

Failed

Full output at http://54.193.163.58:8877/810d5990eb46a4c/output.txt

Total script time: 8.55 mins

• Unit Tests: FAILED