Revert tweaks from bug 540495

Change-Id: I02208ebb4a62e51fd56a4eccfdaa8be6c1416c42
2 files changed