Revert me: More 10.2 speacil cases

Change-Id: Iff978386130e0f04b5566e7dd44395157db26336
Signed-off-by: DHOMD <DHO@dho.im>