- Full revert of r15116.  Using the fix for bugreport:4985 in r15264 instead (ea:15049).
- Full revert of r15116. 
Using the fix for bugreport:4985 in r15264 instead (ea:15049).

git-svn-id: c1e39603916b71782cde5facdf0b79eff05c1414@15274 54d463be-8e91-2dee-dedb-b68131a5f0ec

Nipol/Siesta,Nipol/Siesta,Nipol/Siesta