Put the RIPD-618 fix back in

This fixes the XRP source bug in the RIPD-618 patches so they can go back in.