Revert to bebb7b8cb6ecf80a1092aacbe8b66a35a89eee98

bebb7b8cb6ecf80a1092aacbe8b66a35a89eee98 introduced a bug.
This path adjusting doesn't belpng to the update flux.