Bug 20581: (follow-up) Modify POD