fix: Revert unintentional commits (#18162)

fix: Revert unintentional commits