BZ-11149: saving a few more pixels