Fix deprecation

Change-Id: I8fe8da8d61439e5383a64806831cacc9ec8f790d