Revert "RT# 77964 - fixed so deferring date now works when waive setup fee is set"