some hotfixes/workarounds removed