Revert "Fix broken pep8-trunk job"

This reverts commit d0d95dd9afa34579b9961d96183e23b1d0e9ec8a.

Change-Id: Ie437aef6a0ebd5478fa7593229108ddebf892ea1
Merge "Revert "Fix broken pep8-trunk job""