This reverts commit c4543e7e01b5c1c8fa448855ed63b13944a06a2c.
untested. Maybe revert to Jaspers Version