Get rid of that loading timeout hack