And add a minimal reproducer that shows how the old way was broken.

Change-Id: Ic2dadf9905d603b0fd0573651b235ecd5dd70e71