revert unintended hw312 changes