Removal of temporary fix as it caused more problems.