Revert "Merge branch 'develop' into feature/lending"

This reverts commit 5026f7cb0a29701314d1d22c1c5639b48c9f4263, reversing
changes made to 24c26b8e63084daa38edf9b90692df56e1e2ebc5.