case 2069 - Revert the blackhole field update.
Merge branch 'hotfix' into develop