Rever "Fix for PDroid"