reverted parts of r27117 because it caused regressions

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@27118 3ad0048d-3df7-0310-abae-a5850022a9f2