Revert 9c22a9e..ebd806f

This rolls back to commit 9c22a9ee5aa95d9660dfaab03f47984f03f07659.
Arm fixins