Reverted calls to Assets::instance() back to Assets::factory()