Merge "Revert^2 "Refactor image loading.""