Fixes #6460,BZ1115553 - Removing old orchestration hook