Removed workaround for uint16 byte size PR: #2261