I have not been able to figure out why this bug (#40018) appear and this evil hack might fix it.
Update the tests and updater.