Old method returned, it appears that some servers still has an old
method so both methods are required