[BUGFIX] Respect 'dontRemapRelations' flag in another case, too