Ctrl Z Action affecting Host Editor instead of Embedded Editor

My plugin uses an EditorTextField that is embedded into an Editor via EditorComponentInlaysManager. All of the keyboard shortcuts are working except for Undo/Redo which instead performs the operation on the host Editor. The solution listed here is now deprecated and does not work. I've looked into the changes and it seems like the fix is to override uiDataSnapshot in UiDataProvider and do 

override fun uiDataSnapshot(sink: DataSink) {
    sink.setNull(CommonDataKeys.EDITOR)
}

 I made a class that extends JBPanel and uiDataSnapshot with the above override and added an EditorTextField to it but it seems like the Undo Redo actions are still bubbling up to the host editor and affecting the text there. Does anyone know the fix to this?