In the previous implementation we did a really unnecessary string conversion.

This solution is shorter and cleaner.
It does fix #1065 however it does not solve the underlying discussion about the document plugins unencoding.