"Merge pull request #317 from yenatch/pngs-kind-of" This reverts commit 25025d1b6c00e94ac9e479747898d30267fb3282, reversing changes made to 0d17d4a75866d053f5e0b48c66deb2508071d98b.
The same naming scheme will be used for the replacements. It may or may not be helpful to separate these steps.