Unsure about this, the upstream version seems better at first look. (TODO further investigation)