ref: refs/heads/2023-02-01-sstream-revert
