am eec23260: Put back some deleted code.

* commit 'eec232603d314e486888e5a0d2dd8d507c266be7':
  Put back some deleted code.