Revert "Revert "Reverting to known working state.""
Revert "Revert "Reverting to known working state.""

This reverts commit cac3d782b720630f99006da606f801b7a44296ba.

inbloom/secure-data-service,inbloom/secure-data-service,inbloom/secure-data-service,inbloom/secure-data-service,inbloom/secure-data-service