diff --git a/src/p_floor.cpp b/src/p_floor.cpp
index 10bcf6d7e..ccb1c82e9 100644
--- a/src/p_floor.cpp
+++ b/src/p_floor.cpp
@@ -349,16 +349,14 @@ bool P_CreateFloor(sector_t *sec, DFloor::EFloor floortype, line_t *line,
 		break;
 
 	case DFloor::floorRaiseAndCrushDoom:
+		height = 8;
 	case DFloor::floorRaiseToLowestCeiling:
 		floor->m_Direction = 1;
-		newheight = sec->FindLowestCeilingSurrounding(&spot);
-		if (floortype == DFloor::floorRaiseAndCrushDoom)
-			newheight -= 8;
+		newheight = sec->FindLowestCeilingSurrounding(&spot) - height;
 		ceilingheight = sec->FindLowestCeilingPoint(&spot2);
 		floor->m_FloorDestDist = sec->floorplane.PointToDist(spot, newheight);
 		if (sec->floorplane.ZatPointDist(spot2, floor->m_FloorDestDist) > ceilingheight)
-			floor->m_FloorDestDist = sec->floorplane.PointToDist(spot2,
-				floortype == DFloor::floorRaiseAndCrushDoom ? ceilingheight - 8 : ceilingheight);
+			floor->m_FloorDestDist = sec->floorplane.PointToDist(spot2,	floortype == ceilingheight - height);
 		break;
 
 	case DFloor::floorRaiseToHighest:
@@ -393,7 +391,7 @@ bool P_CreateFloor(sector_t *sec, DFloor::EFloor floortype, line_t *line,
 
 	case DFloor::floorLowerToLowestCeiling:
 		floor->m_Direction = -1;
-		newheight = sec->FindLowestCeilingSurrounding(&spot) - height;
+		newheight = sec->FindLowestCeilingSurrounding(&spot);
 		floor->m_FloorDestDist = sec->floorplane.PointToDist(spot, newheight);
 		break;
 
diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp
index dc6170c24..d0a56ee87 100644
--- a/src/p_lnspec.cpp
+++ b/src/p_lnspec.cpp
@@ -260,7 +260,13 @@ FUNC(LS_Door_Raise)
 FUNC(LS_Door_LockedRaise)
 // Door_LockedRaise (tag, speed, delay, lock, lighttag)
 {
+#if 0
+	// In Hexen this originally created a thinker running for nearly 4 years.
+	// Let's not do this unless it becomes necessary because this can hang tagwait.
+	return EV_DoDoor (arg2 || (level.flags2 & LEVEL2_HEXENHACK) ? DDoor::doorRaise : DDoor::doorOpen, ln, it,
+#else
 	return EV_DoDoor (arg2 ? DDoor::doorRaise : DDoor::doorOpen, ln, it,
+#endif
 					  arg0, SPEED(arg1), TICS(arg2), arg3, arg4);
 }