Not sure why this changed was not pulled from upstream....