Revert "avoid polluting ATDocument's schema"

This reverts commit 74098ce9392237c6a0d5f128b1b9fb11b38ad0ff.
fix in a way that doesn't break the tests