Trying to remove the hack version of initial page data load...