This reverts commit 3c9681e1. It breaks DMO/Qt decoding. It can be commited again when a fix is found.