WIKI-655: Revert code of WIKI-655