c80e65cadb
This reverts commit 14247c334b6fe8a20caba47efba99ef24298106f. As it blocks the Airship projects genesis process. Change-Id: I3b13f4e8f397ee3bc59f85e9a38d8581306deb2d