Bringing back some responsiveness to address Mobile defects
Revert "Bringing back some responsiveness to address Mobile defects"

This reverts commit cb84851290478f12d6765fd6dc6f9e65d7757f8a.