FS-5690 --resolve with bizarre workaround