MAJOR REVERT! Latest official broke Android...
Revert pt 2