Reverted previous changes, it does cause more problems that it solves