[REV][FIX] Reverting regression introduced in forward-port
04211015fc3d4be2a8c65b9d977c2d9c4dac8be7