am 36d9256f: am ac302143: Fix the fix

* commit '36d9256f956b2ed4d7a221d84ad05bf4ba482958':
  Fix the fix