5.3.18

Revert recent community contributions as they introduced crashes on certain devices. I could not reproduce the issues.
Also fixes a startup issue I accidentally introduced in 5.3.17.