Revert "merge gerrit master"

This reverts commit c1daaab60c676ee9fcd61c67052af670235f19e6, reversing
changes made to 20dbf332fe97c8b32ed3ecec5761915e2b85883e.