Revert "Fix ElectronBeam for legacy targets"

This reverts commit 1f80fb3285af2ab98cb37a9bc33ea07f42d55fca.
Fix ElectronBeam for legacy targets