Replace calls to removed functions

From #3101.