Revert "Hotfix 1237"