Implement fix in 59b086daa57105e8fbd8b1e6ba60be6a845faf95 here as well.