Revert recent head-const changes
Merge pull request #2433 from yebblies/headconst

[DDMD] Revert recent head-const changes