A rewrite is available on the "rewrite" branch