Revert "more working on gerrit"

This reverts commit 811ab5f8bc2429a7879bda8695c7fb84730aabee.