revert to pa's build for a bit

Change-Id: I3f180de6305ea455df613bff005286b0bf115a68