Revert "Revert "Revert "Fix Silence & Scatter Shot (Travel Time)"""

This reverts commit dd0fc0228a70a16b4060538361c3dbc246c096ee.