reverse change that broke android compilation.