Revert "Revert "Revert "Ajay/Melanie | #3101 | Updated logic for defaulters"""

This reverts commit 349b3a3507418de89d9350993b5d3794375b771c.
Revert "Temp reminder changes"

This reverts commit 23a20746a6f22c39b22561ec86c0288e6bebe208.