cc @dstufft about adding this to 1.4.2