Merge "Remove workaround for the ByteBuffer#put issue"