diff --git a/flash.h b/flash.h
index b70118d..9caf4e3 100644
--- a/flash.h
+++ b/flash.h
@@ -489,7 +489,6 @@
 /* layout.c */
 int register_include_arg(struct layout_include_args **args, char *name);
 int read_romlayout(const char *name);
-int normalize_romentries(const struct flashctx *flash);
 void layout_cleanup(struct layout_include_args **args);
 
 /* spi.c */
diff --git a/flashrom.c b/flashrom.c
index 803d687..ccc7132 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1803,7 +1803,7 @@
 		return 1;
 	}
 
-	if (flash->layout == get_global_layout() && normalize_romentries(flash)) {
+	if (layout_sanity_checks(flash)) {
 		msg_cerr("Requested regions can not be handled. Aborting.\n");
 		return 1;
 	}
diff --git a/layout.c b/layout.c
index aeffcd7..2c455e2 100644
--- a/layout.c
+++ b/layout.c
@@ -208,11 +208,10 @@
 	flashrom_layout_release(layout);
 }
 
-/* Validate and - if needed - normalize layout entries. */
-int normalize_romentries(const struct flashctx *flash)
+int layout_sanity_checks(const struct flashrom_flashctx *const flash)
 {
-	struct flashrom_layout *const layout = get_global_layout();
-	chipsize_t total_size = flash->chip->total_size * 1024;
+	const struct flashrom_layout *const layout = get_layout(flash);
+	const chipsize_t total_size = flash->chip->total_size * 1024;
 	int ret = 0;
 
 	const struct romentry *entry = NULL;
diff --git a/layout.h b/layout.h
index b34fa43..2beb776 100644
--- a/layout.h
+++ b/layout.h
@@ -57,5 +57,6 @@
 const struct romentry *layout_next_included_region(const struct flashrom_layout *, chipoff_t);
 const struct romentry *layout_next_included(const struct flashrom_layout *, const struct romentry *);
 const struct romentry *layout_next(const struct flashrom_layout *, const struct romentry *);
+int layout_sanity_checks(const struct flashrom_flashctx *);
 
 #endif /* !__LAYOUT_H__ */