Remove Android-specific code added in the previous commit