ed458615c4
This reverts commit f6c8bbf4dc.
Reason for revert: It is considered a breaking change.
Change-Id: I9b2dfc60f62eec7268c0374b0b33e45eca7b3bbb