Revert "23-08"

This reverts commit 865ba84b9eb812d00125f6d148f43cf74643b945.