Revert to 54cf59dc5b6df45f91db0ef1e7f70257131fe406

Change-Id: I5860be5fcb62fce6dfd31d88cbeb281dbfa99a1c