Hotfix not needed anymore