base: Avoid usage of deprecated API