Revert "updates for Xdacted"

This reverts commit 33ee2d76f488874284aa5f375bbff549502937b4.
updated for Xdacted again, but without the auto architecture stuff