prevent bad side effects when modifying one-time charges in place, #28272