diff --git a/meta/classes-recipe/vala.bbclass b/meta/classes-recipe/vala.bbclass
index 460ddb36f04..f23891417e7 100644
--- a/meta/classes-recipe/vala.bbclass
+++ b/meta/classes-recipe/vala.bbclass
@@ -11,8 +11,6 @@ VALADEPENDS = ""
 VALADEPENDS:class-target = "vala"
 DEPENDS:append = " vala-native ${VALADEPENDS}"
 
-# Our patched version of Vala looks in STAGING_DATADIR for .vapi files
-export STAGING_DATADIR
 # Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files
 export XDG_DATA_DIRS = "${STAGING_DATADIR}:${STAGING_LIBDIR}"
 
@@ -22,9 +20,3 @@ FILES:${PN}-dev += "\
     ${datadir}/vala/vapi/*.deps \
     ${datadir}/gir-1.0 \
 "
-
-# Remove vapigen.m4 that is bundled with tarballs
-# because it does not yet have our cross-compile fixes
-do_configure:prepend() {
-        rm -f ${S}/m4/vapigen.m4
-}