fix some cruft from 16-bit revert