am ee8323b6: Fix bad merge.

* commit 'ee8323b6297c9e0e27524805c53d0eb3b271bc93':
  Fix bad merge.