Reverted attempted time fix, broke other things