48df130d87
This reverts commit 6deecf1bfe.
Reason for revert: It is considered a breaking change.
Change-Id: I6bfd81dcc16d36304efa2f151969427249a4122f