This reverts commit 7f6ce06a and adjusts to intermediate changes and makes the fees an optional item. BUG: 390750 FIXED-IN: 5.0.2