Squish another #1369 regression