Revert 1d072b4..fa73d52

This rolls back to commit 1d072b4297c2e0745d8c6cb56750dbfd0b30a9ac.
redid earlier changes to find what's causing disappearing images issue