Bug 10298: Adapt existing code