Revert "Merge pull request #194 from Khan/pf-new-images"

This reverts commit e31e64a8595c2f7f32b006790151c452257aa6fc, reversing
changes made to 68526c015d51929b6f07573cb7713295ee0cbd1f.