Causes an error on update. (cherry picked from commit 4de5a6e00594262e248640c125f0a7dfc88351ba)
hotfixes