Suggestion based on [feedback](https://gitpod.slack.com/archives/C01KPEPNBD0/p1657041828327789) (internal) to #11023 