this is many years overdue, let's do it while 2.1/2.0 are in sync and we are far away from 1.4 now Change-Id: Icf90f957e4d56382a4c91250f55bec4c7abc9d79