Removed a bit more deprecated API.