Merge "Revert "Refactor image loading.""