Revert some changes; try to allow non-gifs to work orthogonal to gifs