Revert "XY Changes"

This reverts commit 431b09d33e55eba74eaf284b7013e238839de11c.