Temp Fix to get policy chaining working again.