Merge pull request #2837 from stewart-ibm/revert-hcode-to-hw040319a.940

Revert HCODE back to hw040319a.940