This reverts commit 4ef5011a7b. Reason for revert: Breaks an internal mocking case that cannot be changed. Test: m Change-Id: I83f9338bde02eb2b45b3e52b66ef78490ddbeeda
4ef5011a7b