Revert to previous

Will see if image caching resolves issue over time.
Fix image path issue