Revert "Play nice with jenkins"

This reverts commit 69d4ea5ac759bf88dc955f7b0c112e006f84db47.

Change-Id: I87ac104e0a705b70c62fb4b519d7ad27f2cb05f5