Of course, found the real bug causing #3117 immediately after the revert. Fixed.