Here's a broken fix for #1499