c84395eada
The fix was correct... This reverts commit 168fd231b65f3bd575529984f552354f4c5e3e8b. Change-Id: If550fd44f32b801553b8ac23cb2a91d3f29df557