This should be deprecated as of 1.0, since this patch won't be in the 0.9 branch.