Still, the perf improvement is so good that I've merged this patch into our master branch at Square.