undoing the hotfix which did not provide a complete solution.