Fixed to work with upstream patch.