Revert "Re-introduced tempoary fix for singular matrix."

Seems not to be needed any more ...
This reverts commit bb12bdd1fd8cdca7d39b7aa513a4a612b76451f8.