revert 4f80f0e; original solution from matthias was correct