This partially reverts commit d0fc1b35, which reintroduced a regression
originally fixed in 5e9986fd.
Signed-off-by: James Almer <jamrial@gmail.com>