[SP-479] Undo workarounds for 5.0.1 release build issue.
Removes override of 'resolve' target.