back to oh-so-smooth thunderg ami304d

Change-Id: I9467f512254fd846e289ab5c86e234fb5fbce747