Re-add of #ifdef by OPPO; not sure why this was removed before