revert r5896 (2007), which was an incorrect spaghetti-transformation (Vittorio).


git-svn-id: svn://svn.code.sf.net/p/cp2k/code/trunk@12894 bac0169d-1eea-4375-b5f6-f89d2ced9994