Fixes #1061: Oups, rollback as the fix is in