diff --git a/Makefile b/Makefile
index b2b51161fc9..305e1b948bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-.error Bad revision, please wait for a fix in head
 #
 # $FreeBSD$
 #
diff --git a/share/mk/src.sys.obj.mk b/share/mk/src.sys.obj.mk
index 7d32ea83601..75541a5ba92 100644
--- a/share/mk/src.sys.obj.mk
+++ b/share/mk/src.sys.obj.mk
@@ -97,7 +97,7 @@ OBJROOT:=	${OBJTOP}/
 # Try to enable MK_AUTO_OBJ by default if we can write to the OBJROOT.  Only
 # do this if AUTO_OBJ is not disabled by the user, not cleaning, and this
 # is the first make ran.
-.if ${.MAKE.LEVEL} == 0 && \
+.if 0 && ${.MAKE.LEVEL} == 0 && \
     ${MK_AUTO_OBJ} == "no" && empty(.MAKEOVERRIDES:MMK_AUTO_OBJ) && \
     !defined(WITHOUT_AUTO_OBJ) && !make(showconfig) && !make(print-dir) && \
     !defined(NO_OBJ) && \