set this back to its original code pre..

commit e5bc8b60
Date:   Tue Aug 5 12:18:20 2014 +0200

to silence coverity about it

Change-Id: I9d8f1bda1a32fbf97c0bdc73edfeab9f74d6443a
cids: 1326180<->1326190