Merge "Revert "Push atoms for decoding images"" into main