regression from a5351434.
Revert one line from that commit without too much understanding :-/

Change-Id: I126c25e2ad945ef1ec20a5677406434931d0790d