Revert reversion of r28379. Maybe this way it's clear why the assert was wrong.