Update to work with new upstream.