Rever arm changes.

We need to properly ifdef out the arm Fix.