Revert 88d620f..b61fa18

This rolls back to commit 88d620f049d86c5acc2f450452048ff1e1da4b73.
07.12-02