Patches
Plain Diff
This reverts commit 15acc84f. Change-Id: Ia640be8cbc134432914849c1750f62575ea084e6