diff --git a/src/system/kernel/vm/VMKernelAddressSpace.cpp b/src/system/kernel/vm/VMKernelAddressSpace.cpp
index 9b5c5c20d1..9c22638548 100644
--- a/src/system/kernel/vm/VMKernelAddressSpace.cpp
+++ b/src/system/kernel/vm/VMKernelAddressSpace.cpp
@@ -587,10 +587,6 @@ VMKernelAddressSpace::_AllocateRange(
 		case B_ANY_ADDRESS:
 		case B_ANY_KERNEL_ADDRESS:
 			address = fBase;
-			// TODO: remove this again when vm86 mode is moved into the kernel
-			// completely (currently needs a userland address space!)
-			if (address == USER_BASE)
-				address = USER_BASE_ANY;
 			break;
 
 		default:
diff --git a/src/system/kernel/vm/VMUserAddressSpace.cpp b/src/system/kernel/vm/VMUserAddressSpace.cpp
index 53249de109..8bd58bcc7e 100644
--- a/src/system/kernel/vm/VMUserAddressSpace.cpp
+++ b/src/system/kernel/vm/VMUserAddressSpace.cpp
@@ -186,7 +186,7 @@ VMUserAddressSpace::InsertArea(VMArea* _area, size_t size,
 		case B_ANY_KERNEL_ADDRESS:
 		case B_ANY_KERNEL_BLOCK_ADDRESS:
 		case B_RANDOMIZED_ANY_ADDRESS:
-			searchBase = fBase;
+			searchBase = std::max(fBase, USER_BASE_ANY);
 			searchEnd = fEndAddress;
 			break;
 
@@ -194,11 +194,6 @@ VMUserAddressSpace::InsertArea(VMArea* _area, size_t size,
 			return B_BAD_VALUE;
 	}
 
-	// TODO: remove this again when vm86 mode is moved into the kernel
-	// completely (currently needs a userland address space!)
-	if (addressRestrictions->address_specification != B_EXACT_ADDRESS)
-		searchBase = std::max(searchBase, (addr_t)USER_BASE_ANY);
-
 	status = _InsertAreaSlot(searchBase, size, searchEnd,
 		addressRestrictions->address_specification,
 		addressRestrictions->alignment, area, allocationFlags);