Bug #41631: Fix regression from first attempt (6569db8)