Revert "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..."

This reverts commit 543b72c171a60de5ca5b27711115efc615372370.