Introduce resource leak

Necessary for maintenance of state during promotion
Merged bug25602 into junk