Matches previous stable design. Related to #7401 (cherry picked from commit 3192d478371bd0c913020cd6262021f12b074827)