Revert "Image: Hack to fix compile errors from LLVM"
Revert "Image: Hack to fix compile errors from LLVM"

This reverts commit 3ede2321bf4bf0bbcda1084e523a9ddd9949b1e9.

AveRapina/visionworkbench,fengzhyuan/visionworkbench,DougFirErickson/visionworkbench,AveRapina/visionworkbench,DougFirErickson/visionworkbench,DougFirErickson/visionworkbench,AveRapina/visionworkbench,DougFirErickson/visionworkbench,AveRapina/visionworkbench,DougFirErickson/visionworkbench,fengzhyuan/visionworkbench,fengzhyuan/visionworkbench,AveRapina/visionworkbench,fengzhyuan/visionworkbench,AveRapina/visionworkbench,DougFirErickson/visionworkbench,fengzhyuan/visionworkbench,fengzhyuan/visionworkbench,fengzhyuan/visionworkbench