am 96464512: Follow-up to Ie62a4486

* commit '96464512080cb8ee87063ab8da52b31c603ad861':
  Follow-up to Ie62a4486