Revert "[BUGFIX] Avoid "Illegal string oft fset 'data'" warning"

This reverts commit e1898e8e2573191f5543d9949b771240cf955720.