Gonna pull this as-is but would be good if you could submit it upstream.