Merge "Revert "Do not load app image for class collisions""