no longer required as it's merged upstream