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