This reverts commit 1fbf7f21. Reason for revert: broke docker image, pinning is incomplete it seems Change-Id: I7102cb233a4fe5ce0f5a1ead98cfc661c3d82ce5