Revert "Fix ElectronBeam for legacy targets"

This reverts commit 13f66acf00ec5031b1d04166168e70e68c1f8509.