Nothing fancy, just not obviously broken like the old one. Fixes #589.