Bring back proper implementation from 9ef870b927, probably gone due to mismerge? Change-Id: I198488e57d9b800cee303373372b1fd165ddf7f1
9ef870b927