Switch to handling fees on callbacks

Change-Id: If8eae4fe4fcd198f40e9f9abd5c957c14c7a2946