Fix deprecation

Change-Id: I8b20a7e4d07d1161adeef72ca94885d717f8126a