reverted hotfix after data cleanup