This simplifies the code a lot. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit a55d32546a8556f9e6cabbc99836b573b9944f0c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: dc0a4db7c9dc593a8568a8e30e4e21e118c2839d Component: engine