Reverting 383e22d based on a previous design discussion.
Merge branch 'release-2.3'