Revert "Slightly better but sketchy preloading fix"

This reverts commit d042f892ba97d0b4239bc68db5cad5765c4f1052.