Revert "Merge branch 'zj-n-1-root-show' into 'master'"
Revert "Merge branch 'zj-n-1-root-show' into 'master'"

This reverts merge request !16968
axilleas/gitlabhq,axilleas/gitlabhq,dreampet/gitlab,stoplightio/gitlabhq,jirutka/gitlabhq,iiet/iiet-git,stoplightio/gitlabhq,mmkassem/gitlabhq,iiet/iiet-git,jirutka/gitlabhq,jirutka/gitlabhq,mmkassem/gitlabhq,dreampet/gitlab,iiet/iiet-git,axilleas/gitlabhq,iiet/iiet-git,dreampet/gitlab,mmkassem/gitlabhq,mmkassem/gitlabhq,axilleas/gitlabhq,jirutka/gitlabhq,stoplightio/gitlabhq,stoplightio/gitlabhq,dreampet/gitlab