Bring back Gapps core only