Fixed the 10.4 deprecation of -resolve. Will call resolveWithTimeout: in 10.4