Revert "apply PR for WIKI-380"

This reverts commit 7492601180510a6f3335369d94f464016ec49271.