Reapplied 0015232e36edda379b80c6b8b797f866fe44d39c, just with preloading still active