squash changes according to https://github.com/zxing/zxing/pull/242