Revert 1b4c2b6..11ff51e

This rolls back to commit 1b4c2b62994d10caead36b4ba19985627410a52c.
PFD 2 interest