Merge "Remove an obsolete workaround."