c8817d: switch to old

Change-Id: I598f0d1cc8fbefba4b8485d87136357434714518