3efc0aca54
This reverts commit 7f3dcbe17f.
Please check with authors first, this bug was already fixed since RC1.