This reverts commit 586ba24ff2. Fixes Ticket 4386 Found-by: Martin Vignali <martin.vignali@gmail.com>
586ba24ff2