Fix prd2190

- Fix PRD-2190
- Remove regression caused by https://github.com/Mirantis/fuel/pull/692 for PRD-1716 & PRD-2023