Temp commit part 2: hack to avoid crackling.