Revert "Revert "borrowers""

This reverts commit 201b7212cb43cd00df7f6c6feecdea3ec5b3d0a2.