FIXING CRITICAL REGRESSION (INTRODUCED IN 0893aac)
ANDROID: SIMPLIFICATION