Merge pull request #1880 from wghoffa/master

Revert HCODE to hw012118a.911