Reverted some cleanups, since things broke with preload data