Removed hotfix