FS-3505 --resolve copied same code from the other place the original intention was to behave as described in the bug report but it seemed like a reasonable enough request