PLA-1705 Restore WHP Helper to original state