Revert "Credentials change"

This reverts commit d6fd6fc7e0d9469394a6c2ddbefbe26a4d040111.