Reverse kang Wil Wheaton Recovery enhancements.

Change-Id: Ia9eace0ff0826801515b335ac6543c1271948612