diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index e87a8891..5a0f14d2 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -68,12 +68,7 @@ TARGET_RECOVERY_WIPE := device/google/gs101/conf/recovery.wipe
 # This is the fstab file that will be included in the recovery image.  Note that
 # recovery doesn't care about the encryption settings, so it doesn't matter
 # whether we use the normal or the fips fstab here.
-#
-# Since this is a generated file, it's necessary to use intermediates-dir-for in
-# order to refer to it correctly.  And since intermediates-dir-for isn't defined
-# yet when this file is included, it's necessary to use a deferred variable
-# assignment ( = ) rather than an immediate variable assignment ( := ).
-TARGET_RECOVERY_FSTAB = $(call intermediates-dir-for,ETC,fstab.gs101)/fstab.gs101
+TARGET_RECOVERY_FSTAB_GENRULE = gen_fstab.gs101
 
 TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165