Revert "xner_ad"

This reverts commit 0eb75bd1a788c7da1318d63e79991e1c4b42e61e.
Revert "Revert "xner_ad""

This reverts commit 1cd0a065066ae6162cbd3eaa3dc9ff13514f5d7d.