Merge "Revert "image-diff fix for javascript dependencies""