Merge "Remove obsolete workaround."