62e1d50c2a
This reverts commit 02bbe11e56.
Reason for revert: It is considered a breaking change.
Change-Id: Ia1f7b27a6d3caa4a9fe12bee469f5f0a6b8327fd