Revert "Revert "not breaking the paths in production branch maybe helps""