Delete the horrible hotfix