Make workaround far less dependent on a specific version.