Revert "fix: 23998625, 69890967"

This reverts commit 3fb23829868e4d22559245cca3b2e669d67dc08a.