Reboot

Sequel of PR #687 (erroneously closed).