Regression inadvertently caused by #5369. With the way this is constructed, this is almost guaranteed to happen. Fixes #5459.