This reverts commit 4c3826e755. Reason for revert: Commit is now necessary after fixes done in other packages Change-Id: Ib41b8b9f333a96cff028869d0a5da77ded6f9008
4c3826e755