revert to API 18 support