diff --git a/src/k_kart.c b/src/k_kart.c
index f30e3bbd4..26f365df1 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -978,12 +978,9 @@ static boolean K_JustBumpedException(mobj_t *mobj)
 	{
 		case MT_SA2_CRATE:
 			return Obj_SA2CrateIsMetal(mobj);
-		case MT_WALLSPIKE:
-			return true;
 		case MT_BATTLECAPSULE:
 		{
-			if (gametype == GT_TUTORIAL // Remove gametype check whenever it's safe to break compatibility with ghosts in a post-release patch
-			&& mobj->momx == 0
+			if (mobj->momx == 0
 			&& mobj->momy == 0
 			&& mobj->momz == 0)
 			{
@@ -991,6 +988,7 @@ static boolean K_JustBumpedException(mobj_t *mobj)
 			}
 			break;
 		}
+		case MT_WALLSPIKE:
 		case MT_STONESHOE:
 			return true;
 		default:
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 645faf3ac..427bdd985 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -14090,9 +14090,8 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj)
 			mobj->scalespeed <<= 1;
 		}
 
-		if (gametype == GT_SPECIAL)
 		{
-			// TODO: When we invalidate replays, permit manual size changes everywhere
+			// Now we're invalidating replays, permit manual size changes everywhere
 			mobj->extravalue1 = FixedMul(mthing->scale, mobj->extravalue1);
 			mobj->scalespeed = FixedMul(mthing->scale, mobj->scalespeed);
 		}