Revert 'avoid ANR'