reverted quick fix due to a long term solution in husky