Remove an old workaround (Fixes #1458)