r139454 activates an assert in a case where we were doing the right thing anyway...