Revert ArchiDroid commit