Revert to previous way of setting 'authenticate'
Revert to previous way of setting 'authenticate'

This reverts commit a055f97a342f670171f30095cabfd4ba1bfdad17.
This reverts commit 4cec5250a3f9058fea5af5ef432a5b230ca94963.

yuvipanda/paws,yuvipanda/paws