This change addresses breaking changes that happened in husky which, as a result, didn't run properly since the update. Closes #7726