Revert "Merge pull request #285 from DmitryLitvintsev/fix/2.6/r6196"

This reverts commit 537b0c69e84a1a05fb38f85293fb6b4ebc40e0b8, reversing
changes made to 35d0087fc25c936323edeeb654b03c19334b08a4.

Ticket: http://rt.dcache.org/Ticket/Display.html?id=8104