This partially brings back the behavior before
10a3db37.

Change-Id: I5b372ab56105c05dda6ecb9aa1eed1c6a0c72ea8