Remove android hack in XS code