Revert "Fix regression introduced in 5c4da579"

This reverts commit ed5af81c38d7689c4e94ef6a20f5b503718bdd66.