Fixed fuzzy commit 9285075e2d66f396c

See my comment in 9285075e2d66f.