[1.5] Revert r1642, as explained on https://groups.google.com/group/openjpeg/msg...