Revert "Patch to support password fields"

This reverts commit b74190713077b8c42496d19c400d07bc82eb2c8e.
Patch to support password fields