diff --git a/soot-infoflow-android/src/soot/jimple/infoflow/android/config/SootConfigForAndroid.java b/soot-infoflow-android/src/soot/jimple/infoflow/android/config/SootConfigForAndroid.java
index 3180c0913..8b40428e4 100644
--- a/soot-infoflow-android/src/soot/jimple/infoflow/android/config/SootConfigForAndroid.java
+++ b/soot-infoflow-android/src/soot/jimple/infoflow/android/config/SootConfigForAndroid.java
@@ -25,9 +25,15 @@ public void setSootOptions(Options options, InfoflowConfiguration config) {
 		List<String> excludeList = new LinkedList<String>();
 		excludeList.add("java.*");
 		excludeList.add("sun.*");
-        // exclude classes of android.* will cause layout class cannot be 
-        // loaded for layout file based callback analysis.
-		// excludeList.add("android.*");
+
+		// exclude classes of android.* will cause layout class cannot be
+		// loaded for layout file based callback analysis.
+
+		// 2020-07-26 (SA): added back the exclusion, because removing it breaks
+		// calls to Android SDK stubs. We need a proper test case for the layout
+		// file issue and then see how to deal with it.
+		excludeList.add("android.*");
+
 		excludeList.add("org.apache.*");
 		excludeList.add("org.eclipse.*");
 		excludeList.add("soot.*");