This is a follow-up issue for:
#4835 (comment 791313895)
I think it would look more clean like this: