Removing patch from puppet as it has been merged upstream