Patch to get goupr working before merging it here.