removed legacyResolve because it will cause problems with 2.0 and 2.1 apps (thanks Burt)