use old system again

Change-Id: If8bb7bfb3b37b05e852d4210bf0301f276cbf8e7