Revert "Change and correct trigger locations."

This reverts commit adb441980be6a2c583024df5263a597207b0a57d.