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

This reverts commit 3b92d71aca6bfeed10c9f7dd8c5e9a2f2b1a53f1.
Revert "Revert "Fix Silence & Scatter Shot (Travel Time)""

This reverts commit 091bb558208f0de6853f218fbc886b7f97c1428d.