Revert "Aries parts from Mackay-Omni"

This reverts commit b4bfdb335c64951d860009d2d24feafcccbec3ac.