Just to preserve the old (and correct) behavior.

Change-Id: I229e0b80097f6d70ff3023072b52576815010b15