Shouldn't be deprecated anymore, since the change happened.