We should be able to drop this once we are using 2.1 or later. See upstream commit: 9663c55c61408fdcc39a82987d2243f816b22932.