Martin Roukala authored 4 years ago and Martin Roukala committed 4 years ago

The current method is non-standard, or considered obsolete, so let's
use the normal method, and hopefully it will resolve some issues that
are hit by some users.

Suggested-by: @ivyl / Arkadiusz Hiler