Revert "This is causing "Unable to pick a platform" errors in all Jenkins builds"

This reverts commit 56f4c92d77b68011f6adfd9ce0f79165d6803db5.

Change-Id: I61815cb11be68a80b383b1e72986577928b6f037
Merge "Revert "This is causing "Unable to pick a platform" errors in all Jenkins builds""