Revert to 2eab8c127374006a57794882490e0a09f6f8c608
Merge branch '2.X-EXPERIMENTAL' of https://github.com/JustArchi/ArchiDroid into 2.X-EXPERIMENTAL