Step 1: Remove all usage of @replaceableComponent

src/components/views/audio_messages/AudioPlayer.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React, { createRef, ReactNode, RefObject } from "react";
 
 import PlayPauseButton from "./PlayPauseButton";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { formatBytes } from "../../../utils/FormattingUtils";
 import DurationClock from "./DurationClock";
 import { _t } from "../../../languageHandler";
@@ -27,7 +26,6 @@ import AudioPlayerBase from "./AudioPlayerBase";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 
-@replaceableComponent("views.audio_messages.AudioPlayer")
 export default class AudioPlayer extends AudioPlayerBase {
     private playPauseRef: RefObject<PlayPauseButton> = createRef();
     private seekRef: RefObject<SeekBar> = createRef();

src/components/views/audio_messages/AudioPlayerBase.tsx

@@ -19,7 +19,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import { Playback, PlaybackState } from "../../../audio/Playback";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { _t } from "../../../languageHandler";
 
 interface IProps {
@@ -35,7 +34,6 @@ interface IState {
     error?: boolean;
 }
 
-@replaceableComponent("views.audio_messages.AudioPlayerBase")
 export default abstract class AudioPlayerBase extends React.PureComponent<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/views/audio_messages/Clock.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React, { HTMLProps } from "react";
 
 import { formatSeconds } from "../../../DateUtils";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 export interface IProps extends Pick<HTMLProps<HTMLSpanElement>, "aria-live"> {
     seconds: number;
@@ -27,7 +26,6 @@ export interface IProps extends Pick<HTMLProps<HTMLSpanElement>, "aria-live"> {
  * Simply converts seconds into minutes and seconds. Note that hours will not be
  * displayed, making it possible to see "82:29".
  */
-@replaceableComponent("views.audio_messages.Clock")
 export default class Clock extends React.Component<IProps> {
     public constructor(props) {
         super(props);

src/components/views/audio_messages/DurationClock.tsx

@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Clock from "./Clock";
 import { Playback } from "../../../audio/Playback";
 
@@ -31,7 +30,6 @@ interface IState {
 /**
  * A clock which shows a clip's maximum duration.
  */
-@replaceableComponent("views.audio_messages.DurationClock")
 export default class DurationClock extends React.PureComponent<IProps, IState> {
     public constructor(props) {
         super(props);

src/components/views/audio_messages/LiveRecordingClock.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 
 import { IRecordingUpdate, VoiceRecording } from "../../../audio/VoiceRecording";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Clock from "./Clock";
 import { MarkedExecution } from "../../../utils/MarkedExecution";
 
@@ -32,7 +31,6 @@ interface IState {
 /**
  * A clock for a live recording.
  */
-@replaceableComponent("views.audio_messages.LiveRecordingClock")
 export default class LiveRecordingClock extends React.PureComponent<IProps, IState> {
     private seconds = 0;
     private scheduledUpdate = new MarkedExecution(

src/components/views/audio_messages/LiveRecordingWaveform.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 
 import { IRecordingUpdate, RECORDING_PLAYBACK_SAMPLES, VoiceRecording } from "../../../audio/VoiceRecording";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { arrayFastResample, arraySeed } from "../../../utils/arrays";
 import Waveform from "./Waveform";
 import { MarkedExecution } from "../../../utils/MarkedExecution";
@@ -33,7 +32,6 @@ interface IState {
 /**
  * A waveform which shows the waveform of a live recording
  */
-@replaceableComponent("views.audio_messages.LiveRecordingWaveform")
 export default class LiveRecordingWaveform extends React.PureComponent<IProps, IState> {
     public static defaultProps = {
         progress: 1,

src/components/views/audio_messages/PlayPauseButton.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React, { ReactNode } from "react";
 import classNames from "classnames";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
 import { _t } from "../../../languageHandler";
 import { Playback, PlaybackState } from "../../../audio/Playback";
@@ -35,7 +34,6 @@ interface IProps extends Omit<React.ComponentProps<typeof AccessibleTooltipButto
  * Displays a play/pause button (activating the play/pause function of the recorder)
  * to be displayed in reference to a recording.
  */
-@replaceableComponent("views.audio_messages.PlayPauseButton")
 export default class PlayPauseButton extends React.PureComponent<IProps> {
     public constructor(props) {
         super(props);

src/components/views/audio_messages/PlaybackClock.tsx

@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Clock from "./Clock";
 import { Playback, PlaybackState } from "../../../audio/Playback";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
@@ -39,7 +38,6 @@ interface IState {
 /**
  * A clock for a playback of a recording.
  */
-@replaceableComponent("views.audio_messages.PlaybackClock")
 export default class PlaybackClock extends React.PureComponent<IProps, IState> {
     public constructor(props) {
         super(props);

src/components/views/audio_messages/PlaybackWaveform.tsx

@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { arraySeed, arrayTrimFill } from "../../../utils/arrays";
 import Waveform from "./Waveform";
 import { Playback, PLAYBACK_WAVEFORM_SAMPLES } from "../../../audio/Playback";
@@ -34,7 +33,6 @@ interface IState {
 /**
  * A waveform which shows the waveform of a previously recorded recording
  */
-@replaceableComponent("views.audio_messages.PlaybackWaveform")
 export default class PlaybackWaveform extends React.PureComponent<IProps, IState> {
     public constructor(props) {
         super(props);

src/components/views/audio_messages/RecordingPlayback.tsx

@@ -18,12 +18,10 @@ import React, { ReactNode } from "react";
 
 import PlayPauseButton from "./PlayPauseButton";
 import PlaybackClock from "./PlaybackClock";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import PlaybackWaveform from "./PlaybackWaveform";
 import AudioPlayerBase from "./AudioPlayerBase";
 import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
 
-@replaceableComponent("views.audio_messages.RecordingPlayback")
 export default class RecordingPlayback extends AudioPlayerBase {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;

src/components/views/audio_messages/SeekBar.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React, { ChangeEvent, CSSProperties, ReactNode } from "react";
 
 import { Playback, PlaybackState } from "../../../audio/Playback";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { MarkedExecution } from "../../../utils/MarkedExecution";
 import { percentageOf } from "../../../utils/numbers";
 
@@ -43,7 +42,6 @@ interface ISeekCSS extends CSSProperties {
 
 const ARROW_SKIP_SECONDS = 5; // arbitrary
 
-@replaceableComponent("views.audio_messages.SeekBar")
 export default class SeekBar extends React.PureComponent<IProps, IState> {
     // We use an animation frame request to avoid overly spamming prop updates, even if we aren't
     // really using anything demanding on the CSS front.

src/components/views/audio_messages/Waveform.tsx

@@ -17,8 +17,6 @@ limitations under the License.
 import React, { CSSProperties } from "react";
 import classNames from "classnames";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 interface WaveformCSSProperties extends CSSProperties {
     '--barHeight': number;
 }
@@ -39,7 +37,6 @@ interface IState {
  * For CSS purposes, a mx_Waveform_bar_100pct class is added when the bar should be
  * "filled", as a demonstration of the progress property.
  */
-@replaceableComponent("views.audio_messages.Waveform")
 export default class Waveform extends React.PureComponent<IProps, IState> {
     public static defaultProps = {
         progress: 1,

src/components/views/auth/AuthBody.tsx

@@ -16,9 +16,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.auth.AuthBody")
 export default class AuthBody extends React.PureComponent {
     public render(): React.ReactNode {
         return <div className="mx_AuthBody">

src/components/views/auth/AuthFooter.tsx

@@ -19,9 +19,7 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-@replaceableComponent("views.auth.AuthFooter")
 export default class AuthFooter extends React.Component {
     public render(): React.ReactNode {
         return (

src/components/views/auth/AuthHeader.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AuthHeaderLogo from "./AuthHeaderLogo";
 import LanguageSelector from "./LanguageSelector";
 
@@ -25,7 +24,6 @@ interface IProps {
     disableLanguageSelector?: boolean;
 }
 
-@replaceableComponent("views.auth.AuthHeader")
 export default class AuthHeader extends React.Component<IProps> {
     public render(): React.ReactNode {
         return (

src/components/views/auth/AuthHeaderLogo.tsx

@@ -16,9 +16,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.auth.AuthHeaderLogo")
 export default class AuthHeaderLogo extends React.PureComponent {
     public render(): React.ReactNode {
         return <div className="mx_AuthHeaderLogo">

src/components/views/auth/AuthPage.tsx

@@ -18,10 +18,8 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AuthFooter from "./AuthFooter";
 
-@replaceableComponent("views.auth.AuthPage")
 export default class AuthPage extends React.PureComponent {
     public render(): React.ReactNode {
         return (

src/components/views/auth/CaptchaForm.tsx

@@ -18,7 +18,6 @@ import React, { createRef } from 'react';
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 const DIV_ID = 'mx_recaptcha';
 
@@ -35,7 +34,6 @@ interface ICaptchaFormState {
 /**
  * A pure UI component which displays a captcha form.
  */
-@replaceableComponent("views.auth.CaptchaForm")
 export default class CaptchaForm extends React.Component<ICaptchaFormProps, ICaptchaFormState> {
     static defaultProps = {
         onCaptchaResponse: () => {},

src/components/views/auth/CompleteSecurityBody.tsx

@@ -16,9 +16,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-@replaceableComponent("views.auth.CompleteSecurityBody")
 export default class CompleteSecurityBody extends React.PureComponent {
     public render(): React.ReactNode {
         return <div className="mx_CompleteSecurityBody">

src/components/views/auth/CountryDropdown.tsx

@@ -19,7 +19,6 @@ import React from 'react';
 import { COUNTRIES, getEmojiFlag, PhoneNumberCountryDefinition } from '../../../phonenumber';
 import SdkConfig from "../../../SdkConfig";
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Dropdown from "../elements/Dropdown";
 
 const COUNTRIES_BY_ISO2 = {};
@@ -53,7 +52,6 @@ interface IState {
     defaultCountry: PhoneNumberCountryDefinition;
 }
 
-@replaceableComponent("views.auth.CountryDropdown")
 export default class CountryDropdown extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/views/auth/EmailField.tsx

@@ -16,7 +16,6 @@ limitations under the License.
 
 import React, { PureComponent, RefCallback, RefObject } from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Field, { IInputProps } from "../elements/Field";
 import { _t, _td } from "../../../languageHandler";
 import withValidation, { IFieldState, IValidationResult } from "../elements/Validation";
@@ -39,7 +38,6 @@ interface IProps extends Omit<IInputProps, "onValidate"> {
     onValidate?(result: IValidationResult): void;
 }
 
-@replaceableComponent("views.auth.EmailField")
 class EmailField extends PureComponent<IProps> {
     static defaultProps = {
         label: _td("Email"),

src/components/views/auth/InteractiveAuthEntryComponents.tsx

@@ -24,7 +24,6 @@ import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
 import Spinner from "../elements/Spinner";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { LocalisedPolicy, Policies } from '../../../Terms';
 import Field from '../elements/Field';
 import CaptchaForm from "./CaptchaForm";
@@ -93,7 +92,6 @@ interface IPasswordAuthEntryState {
     password: string;
 }
 
-@replaceableComponent("views.auth.PasswordAuthEntry")
 export class PasswordAuthEntry extends React.Component<IAuthEntryProps, IPasswordAuthEntryState> {
     static LOGIN_TYPE = AuthType.Password;
 
@@ -191,7 +189,6 @@ interface IRecaptchaAuthEntryProps extends IAuthEntryProps {
 }
 /* eslint-enable camelcase */
 
-@replaceableComponent("views.auth.RecaptchaAuthEntry")
 export class RecaptchaAuthEntry extends React.Component<IRecaptchaAuthEntryProps> {
     static LOGIN_TYPE = AuthType.Recaptcha;
 
@@ -262,7 +259,6 @@ interface ITermsAuthEntryState {
     errorText?: string;
 }
 
-@replaceableComponent("views.auth.TermsAuthEntry")
 export class TermsAuthEntry extends React.Component<ITermsAuthEntryProps, ITermsAuthEntryState> {
     static LOGIN_TYPE = AuthType.Terms;
 
@@ -409,7 +405,6 @@ interface IEmailIdentityAuthEntryProps extends IAuthEntryProps {
     };
 }
 
-@replaceableComponent("views.auth.EmailIdentityAuthEntry")
 export class EmailIdentityAuthEntry extends React.Component<IEmailIdentityAuthEntryProps> {
     static LOGIN_TYPE = AuthType.Email;
 
@@ -472,7 +467,6 @@ interface IMsisdnAuthEntryState {
     errorText: string;
 }
 
-@replaceableComponent("views.auth.MsisdnAuthEntry")
 export class MsisdnAuthEntry extends React.Component<IMsisdnAuthEntryProps, IMsisdnAuthEntryState> {
     static LOGIN_TYPE = AuthType.Msisdn;
 
@@ -623,7 +617,6 @@ interface ISSOAuthEntryState {
     attemptFailed: boolean;
 }
 
-@replaceableComponent("views.auth.SSOAuthEntry")
 export class SSOAuthEntry extends React.Component<ISSOAuthEntryProps, ISSOAuthEntryState> {
     static LOGIN_TYPE = AuthType.Sso;
     static UNSTABLE_LOGIN_TYPE = AuthType.SsoUnstable;
@@ -743,7 +736,6 @@ export class SSOAuthEntry extends React.Component<ISSOAuthEntryProps, ISSOAuthEn
     }
 }
 
-@replaceableComponent("views.auth.FallbackAuthEntry")
 export class FallbackAuthEntry extends React.Component<IAuthEntryProps> {
     private popupWindow: Window;
     private fallbackButton = createRef<HTMLButtonElement>();

src/components/views/auth/PassphraseConfirmField.tsx

@@ -16,7 +16,6 @@ limitations under the License.
 
 import React, { PureComponent, RefCallback, RefObject } from "react";
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Field, { IInputProps } from "../elements/Field";
 import withValidation, { IFieldState, IValidationResult } from "../elements/Validation";
 import { _t, _td } from "../../../languageHandler";
@@ -35,7 +34,6 @@ interface IProps extends Omit<IInputProps, "onValidate"> {
     onValidate?(result: IValidationResult);
 }
 
-@replaceableComponent("views.auth.EmailField")
 class PassphraseConfirmField extends PureComponent<IProps> {
     static defaultProps = {
         label: _td("Confirm password"),

src/components/views/auth/PassphraseField.tsx

@@ -22,7 +22,6 @@ import SdkConfig from "../../../SdkConfig";
 import withValidation, { IFieldState, IValidationResult } from "../elements/Validation";
 import { _t, _td } from "../../../languageHandler";
 import Field, { IInputProps } from "../elements/Field";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends Omit<IInputProps, "onValidate"> {
     autoFocus?: boolean;
@@ -41,7 +40,6 @@ interface IProps extends Omit<IInputProps, "onValidate"> {
     onValidate?(result: IValidationResult);
 }
 
-@replaceableComponent("views.auth.PassphraseField")
 class PassphraseField extends PureComponent<IProps> {
     static defaultProps = {
         label: _td("Password"),

src/components/views/auth/PasswordLogin.tsx

@@ -24,7 +24,6 @@ import AccessibleButton from "../elements/AccessibleButton";
 import withValidation, { IValidationResult } from "../elements/Validation";
 import Field from "../elements/Field";
 import CountryDropdown from "./CountryDropdown";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import EmailField from "./EmailField";
 
 // For validating phone numbers without country codes
@@ -66,7 +65,6 @@ enum LoginField {
  * A pure UI component which displays a username/password form.
  * The email/username/phone fields are fully-controlled, the password field is not.
  */
-@replaceableComponent("views.auth.PasswordLogin")
 export default class PasswordLogin extends React.PureComponent<IProps, IState> {
     static defaultProps = {
         onUsernameChanged: function() {},

src/components/views/auth/RegistrationForm.tsx

@@ -31,7 +31,6 @@ import EmailField from "./EmailField";
 import PassphraseField from "./PassphraseField";
 import Field from '../elements/Field';
 import RegistrationEmailPromptDialog from '../dialogs/RegistrationEmailPromptDialog';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import CountryDropdown from "./CountryDropdown";
 import PassphraseConfirmField from "./PassphraseConfirmField";
 
@@ -92,7 +91,6 @@ interface IState {
 /*
  * A pure UI component which displays a registration form.
  */
-@replaceableComponent("views.auth.RegistrationForm")
 export default class RegistrationForm extends React.PureComponent<IProps, IState> {
     static defaultProps = {
         onValidationChange: logger.error,

src/components/views/auth/Welcome.tsx

@@ -23,7 +23,6 @@ import AuthPage from "./AuthPage";
 import { _td } from "../../../languageHandler";
 import SettingsStore from "../../../settings/SettingsStore";
 import { UIFeature } from "../../../settings/UIFeature";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import LanguageSelector from "./LanguageSelector";
 
 // translatable strings for Welcome pages
@@ -33,7 +32,6 @@ interface IProps {
 
 }
 
-@replaceableComponent("views.auth.Welcome")
 export default class Welcome extends React.PureComponent<IProps> {
     public render(): React.ReactNode {
         // FIXME: Using an import will result in wrench-element-tests failures

src/components/views/avatars/DecoratedRoomAvatar.tsx

@@ -32,7 +32,6 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from "../../../languageHandler";
 import TextWithTooltip from "../elements/TextWithTooltip";
 import DMRoomMap from "../../../utils/DMRoomMap";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IOOBData } from "../../../stores/ThreepidInviteStore";
 import TooltipTarget from "../elements/TooltipTarget";
 
@@ -78,7 +77,6 @@ function tooltipText(variant: Icon) {
     }
 }
 
-@replaceableComponent("views.avatars.DecoratedRoomAvatar")
 export default class DecoratedRoomAvatar extends React.PureComponent<IProps, IState> {
     private _dmUser: User;
     private isUnmounted = false;

src/components/views/avatars/MemberAvatar.tsx

@@ -23,7 +23,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 import dis from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
 import BaseAvatar from "./BaseAvatar";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import { CardContext } from '../right_panel/BaseCard';
 import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
@@ -52,7 +51,6 @@ interface IState {
     imageUrl?: string;
 }
 
-@replaceableComponent("views.avatars.MemberAvatar")
 export default class MemberAvatar extends React.PureComponent<IProps, IState> {
     public static defaultProps = {
         width: 40,

src/components/views/avatars/RoomAvatar.tsx

@@ -28,7 +28,6 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import * as Avatar from '../../../Avatar';
 import DMRoomMap from "../../../utils/DMRoomMap";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import { IOOBData } from '../../../stores/ThreepidInviteStore';
 
@@ -52,7 +51,6 @@ interface IState {
     urls: string[];
 }
 
-@replaceableComponent("views.avatars.RoomAvatar")
 export default class RoomAvatar extends React.Component<IProps, IState> {
     public static defaultProps = {
         width: 36,

src/components/views/context_menus/CallContextMenu.tsx

@@ -21,13 +21,11 @@ import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import { _t } from '../../../languageHandler';
 import ContextMenu, { IProps as IContextMenuProps, MenuItem } from '../../structures/ContextMenu';
 import CallHandler from '../../../CallHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends IContextMenuProps {
     call: MatrixCall;
 }
 
-@replaceableComponent("views.context_menus.CallContextMenu")
 export default class CallContextMenu extends React.Component<IProps> {
     static propTypes = {
         // js-sdk User object. Not required because it might not exist.

src/components/views/context_menus/DialpadContextMenu.tsx

@@ -22,7 +22,6 @@ import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
 import ContextMenu, { IProps as IContextMenuProps } from '../../structures/ContextMenu';
 import Field from "../elements/Field";
 import DialPad from '../voip/DialPad';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends IContextMenuProps {
     call: MatrixCall;
@@ -32,7 +31,6 @@ interface IState {
     value: string;
 }
 
-@replaceableComponent("views.context_menus.DialpadContextMenu")
 export default class DialpadContextMenu extends React.Component<IProps, IState> {
     private numberEntryFieldRef: React.RefObject<Field> = createRef();
 

src/components/views/context_menus/GenericElementContextMenu.tsx

@@ -16,8 +16,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 interface IProps {
     element: React.ReactNode;
     // Function to be called when the parent window is resized
@@ -30,7 +28,6 @@ interface IProps {
  * This component can be used to display generic HTML content in a contextual
  * menu.
  */
-@replaceableComponent("views.context_menus.GenericElementContextMenu")
 export default class GenericElementContextMenu extends React.Component<IProps> {
     constructor(props: IProps) {
         super(props);

src/components/views/context_menus/GenericTextContextMenu.tsx

@@ -16,13 +16,10 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 interface IProps {
     message: string;
 }
 
-@replaceableComponent("views.context_menus.GenericTextContextMenu")
 export default class GenericTextContextMenu extends React.Component<IProps> {
     public render(): JSX.Element {
         return <div className="mx_Tooltip mx_Tooltip_visible" style={{ display: "block" }}>

src/components/views/context_menus/MessageContextMenu.tsx

@@ -32,7 +32,6 @@ import SettingsStore from '../../../settings/SettingsStore';
 import { isUrlPermitted } from '../../../HtmlUtils';
 import { isContentActionable } from '../../../utils/EventUtils';
 import IconizedContextMenu, { IconizedContextMenuOption, IconizedContextMenuOptionList } from './IconizedContextMenu';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ReadPinsEventId } from "../right_panel/PinnedMessagesCard";
 import ForwardDialog from "../dialogs/ForwardDialog";
 import { Action } from "../../../dispatcher/actions";
@@ -88,7 +87,6 @@ interface IState {
     canPin: boolean;
 }
 
-@replaceableComponent("views.context_menus.MessageContextMenu")
 export default class MessageContextMenu extends React.Component<IProps, IState> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;

src/components/views/dialogs/AskInviteAnywayDialog.tsx

@@ -19,7 +19,6 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import { SettingLevel } from "../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 
 interface IProps {
@@ -32,7 +31,6 @@ interface IProps {
     onFinished: (success: boolean) => void;
 }
 
-@replaceableComponent("views.dialogs.AskInviteAnywayDialog")
 export default class AskInviteAnywayDialog extends React.Component<IProps> {
     private onInviteClicked = (): void => {
         this.props.onInviteAnyways();

src/components/views/dialogs/BaseDialog.tsx

@@ -25,7 +25,6 @@ import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from "../../../languageHandler";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Heading from '../typography/Heading';
 import { IDialogProps } from "./IDialogProps";
 import { PosthogScreenTracker, ScreenName } from "../../../PosthogTrackers";
@@ -81,7 +80,6 @@ interface IProps extends IDialogProps {
  * Includes a div for the title, and a keypress handler which cancels the
  * dialog on escape.
  */
-@replaceableComponent("views.dialogs.BaseDialog")
 export default class BaseDialog extends React.Component<IProps> {
     private matrixClient: MatrixClient;
 

src/components/views/dialogs/BugReportDialog.tsx

@@ -24,7 +24,6 @@ import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
 import sendBugReport, { downloadBugReport } from '../../../rageshake/submit-rageshake';
 import AccessibleButton from "../elements/AccessibleButton";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import QuestionDialog from "./QuestionDialog";
 import BaseDialog from "./BaseDialog";
 import Field from '../elements/Field';
@@ -50,7 +49,6 @@ interface IState {
     downloadProgress: string;
 }
 
-@replaceableComponent("views.dialogs.BugReportDialog")
 export default class BugReportDialog extends React.Component<IProps, IState> {
     private unmounted: boolean;
 

src/components/views/dialogs/ConfirmAndWaitRedactDialog.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import ConfirmRedactDialog from './ConfirmRedactDialog';
 import ErrorDialog from './ErrorDialog';
 import BaseDialog from "./BaseDialog";
@@ -45,7 +44,6 @@ interface IState {
  *
  * To avoid this, we keep the dialog open as long as /redact is in progress.
  */
-@replaceableComponent("views.dialogs.ConfirmAndWaitRedactDialog")
 export default class ConfirmAndWaitRedactDialog extends React.PureComponent<IProps, IState> {
     constructor(props) {
         super(props);

src/components/views/dialogs/ConfirmRedactDialog.tsx

@@ -20,7 +20,6 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import ErrorDialog from './ErrorDialog';
 import TextInputDialog from "./TextInputDialog";
 
@@ -31,7 +30,6 @@ interface IProps {
 /*
  * A dialog for confirming a redaction.
  */
-@replaceableComponent("views.dialogs.ConfirmRedactDialog")
 export default class ConfirmRedactDialog extends React.Component<IProps> {
     render() {
         return (

src/components/views/dialogs/ConfirmUserActionDialog.tsx

@@ -19,7 +19,6 @@ import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import classNames from "classnames";
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import MemberAvatar from '../avatars/MemberAvatar';
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
@@ -55,7 +54,6 @@ interface IState {
  * to make it obvious what is going to happen.
  * Also tweaks the style for 'dangerous' actions (albeit only with colour)
  */
-@replaceableComponent("views.dialogs.ConfirmUserActionDialog")
 export default class ConfirmUserActionDialog extends React.Component<IProps, IState> {
     static defaultProps = {
         danger: false,

src/components/views/dialogs/ConfirmWipeDeviceDialog.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 
@@ -25,7 +24,6 @@ interface IProps {
     onFinished: (success: boolean) => void;
 }
 
-@replaceableComponent("views.dialogs.ConfirmWipeDeviceDialog")
 export default class ConfirmWipeDeviceDialog extends React.Component<IProps> {
     private onConfirm = (): void => {
         this.props.onFinished(true);

src/components/views/dialogs/CreateRoomDialog.tsx

@@ -26,7 +26,6 @@ import withValidation, { IFieldState } from '../elements/Validation';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { IOpts, privateShouldBeEncrypted } from "../../../createRoom";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Heading from "../typography/Heading";
 import Field from "../elements/Field";
 import StyledRadioGroup from "../elements/StyledRadioGroup";
@@ -61,7 +60,6 @@ interface IState {
     canChangeEncryption: boolean;
 }
 
-@replaceableComponent("views.dialogs.CreateRoomDialog")
 export default class CreateRoomDialog extends React.Component<IProps, IState> {
     private readonly supportsRestricted: boolean;
     private nameField = createRef<Field>();

src/components/views/dialogs/DeactivateAccountDialog.tsx

@@ -26,7 +26,6 @@ import { _t } from '../../../languageHandler';
 import InteractiveAuth, { ERROR_USER_CANCELLED } from "../../structures/InteractiveAuth";
 import { DEFAULT_PHASE, PasswordAuthEntry, SSOAuthEntry } from "../auth/InteractiveAuthEntryComponents";
 import StyledCheckbox from "../elements/StyledCheckbox";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 
 interface IProps {
@@ -46,7 +45,6 @@ interface IState {
     continueKind: string;
 }
 
-@replaceableComponent("views.dialogs.DeactivateAccountDialog")
 export default class DeactivateAccountDialog extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);

src/components/views/dialogs/ErrorDialog.tsx

@@ -28,7 +28,6 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 
 interface IProps {
@@ -44,7 +43,6 @@ interface IState {
     onFinished: (success: boolean) => void;
 }
 
-@replaceableComponent("views.dialogs.ErrorDialog")
 export default class ErrorDialog extends React.Component<IProps, IState> {
     public static defaultProps = {
         focus: true,

src/components/views/dialogs/HostSignupDialog.tsx

@@ -32,7 +32,6 @@ import {
     IPostmessageResponseData,
     PostmessageAction,
 } from "./HostSignupDialogTypes";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IConfigOptions } from "../../../IConfigOptions";
 import { SnakedObject } from "../../../utils/SnakedObject";
 
@@ -46,7 +45,6 @@ interface IState {
     minimized: boolean;
 }
 
-@replaceableComponent("views.dialogs.HostSignupDialog")
 export default class HostSignupDialog extends React.PureComponent<IProps, IState> {
     private iframeRef: React.RefObject<HTMLIFrameElement> = React.createRef();
     private readonly config: SnakedObject<IConfigOptions["host_signup"]>;

src/components/views/dialogs/IncomingSasDialog.tsx

@@ -21,7 +21,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import VerificationComplete from "../verification/VerificationComplete";
 import VerificationCancelled from "../verification/VerificationCancelled";
@@ -54,7 +53,6 @@ interface IState {
     sas: IGeneratedSas;
 }
 
-@replaceableComponent("views.dialogs.IncomingSasDialog")
 export default class IncomingSasDialog extends React.Component<IProps, IState> {
     private showSasEvent: ISasEvent;
 

src/components/views/dialogs/IntegrationsDisabledDialog.tsx

@@ -19,14 +19,12 @@ import React from 'react';
 import { _t } from "../../../languageHandler";
 import dis from '../../../dispatcher/dispatcher';
 import { Action } from "../../../dispatcher/actions";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import { IDialogProps } from "./IDialogProps";
 
 interface IProps extends IDialogProps {}
 
-@replaceableComponent("views.dialogs.IntegrationsDisabledDialog")
 export default class IntegrationsDisabledDialog extends React.Component<IProps> {
     private onAcknowledgeClick = (): void => {
         this.props.onFinished();

src/components/views/dialogs/IntegrationsImpossibleDialog.tsx

@@ -18,14 +18,12 @@ import React from 'react';
 
 import { _t } from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IDialogProps } from "./IDialogProps";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 
 interface IProps extends IDialogProps {}
 
-@replaceableComponent("views.dialogs.IntegrationsImpossibleDialog")
 export default class IntegrationsImpossibleDialog extends React.Component<IProps> {
     private onAcknowledgeClick = (): void => {
         this.props.onFinished();

src/components/views/dialogs/InteractiveAuthDialog.tsx

@@ -24,7 +24,6 @@ import { _t } from '../../../languageHandler';
 import AccessibleButton from '../elements/AccessibleButton';
 import InteractiveAuth, { ERROR_USER_CANCELLED } from "../../structures/InteractiveAuth";
 import { SSOAuthEntry } from "../auth/InteractiveAuthEntryComponents";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import { IDialogProps } from "./IDialogProps";
 
@@ -83,7 +82,6 @@ interface IState {
     uiaStagePhase: number | string;
 }
 
-@replaceableComponent("views.dialogs.InteractiveAuthDialog")
 export default class InteractiveAuthDialog extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/views/dialogs/InviteDialog.tsx

@@ -49,7 +49,6 @@ import { DefaultTagID } from "../../../stores/room-list/models";
 import RoomListStore from "../../../stores/room-list/RoomListStore";
 import SettingsStore from "../../../settings/SettingsStore";
 import { UIFeature } from "../../../settings/UIFeature";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import { getAddressType } from "../../../UserAddress";
 import BaseAvatar from '../avatars/BaseAvatar';
@@ -387,7 +386,6 @@ interface IInviteDialogState {
     errorText: string;
 }
 
-@replaceableComponent("views.dialogs.InviteDialog")
 export default class InviteDialog extends React.PureComponent<IInviteDialogProps, IInviteDialogState> {
     static defaultProps = {
         kind: KIND_DM,

src/components/views/dialogs/LogoutDialog.tsx

@@ -24,7 +24,6 @@ import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import RestoreKeyBackupDialog from './security/RestoreKeyBackupDialog';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import QuestionDialog from "./QuestionDialog";
 import BaseDialog from "./BaseDialog";
 import Spinner from "../elements/Spinner";
@@ -41,7 +40,6 @@ interface IState {
     error?: string;
 }
 
-@replaceableComponent("views.dialogs.LogoutDialog")
 export default class LogoutDialog extends React.Component<IProps, IState> {
     static defaultProps = {
         onFinished: function() {},

src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx

@@ -24,7 +24,6 @@ import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo";
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import QuestionDialog from "./QuestionDialog";
 import { IDialogProps } from "./IDialogProps";
 
@@ -33,7 +32,6 @@ interface IProps extends IDialogProps {
     device: DeviceInfo;
 }
 
-@replaceableComponent("views.dialogs.ManualDeviceKeyVerificationDialog")
 export default class ManualDeviceKeyVerificationDialog extends React.Component<IProps> {
     private onLegacyFinished = (confirm: boolean): void => {
         if (confirm) {

src/components/views/dialogs/MessageEditHistoryDialog.tsx

@@ -25,7 +25,6 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import { wantsDateSeparator } from '../../../DateUtils';
 import SettingsStore from '../../../settings/SettingsStore';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import ScrollPanel from "../../structures/ScrollPanel";
 import Spinner from "../elements/Spinner";
@@ -48,7 +47,6 @@ interface IState {
     isTwelveHour: boolean;
 }
 
-@replaceableComponent("views.dialogs.MessageEditHistoryDialog")
 export default class MessageEditHistoryDialog extends React.PureComponent<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/views/dialogs/ModalWidgetDialog.tsx

@@ -39,7 +39,6 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { OwnProfileStore } from "../../../stores/OwnProfileStore";
 import { arrayFastClone } from "../../../utils/arrays";
 import { ElementWidget } from "../../../stores/widgets/StopGapWidget";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ELEMENT_CLIENT_ID } from "../../../identifiers";
 import SettingsStore from "../../../settings/SettingsStore";
 
@@ -57,7 +56,6 @@ interface IState {
 
 const MAX_BUTTONS = 3;
 
-@replaceableComponent("views.dialogs.ModalWidgetDialog")
 export default class ModalWidgetDialog extends React.PureComponent<IProps, IState> {
     private readonly widget: Widget;
     private readonly possibleButtons: ModalButtonID[];

src/components/views/dialogs/ReportEventDialog.tsx

@@ -23,7 +23,6 @@ import { IDialogProps } from "./IDialogProps";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import SdkConfig from '../../../SdkConfig';
 import Markdown from '../../../Markdown';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import SettingsStore from "../../../settings/SettingsStore";
 import StyledRadioButton from "../elements/StyledRadioButton";
 import BaseDialog from "./BaseDialog";
@@ -89,7 +88,6 @@ type Moderation = {
  *    a well-formed state event `m.room.moderation.moderated_by`
  *    /`org.matrix.msc3215.room.moderation.moderated_by`?
  */
-@replaceableComponent("views.dialogs.ReportEventDialog")
 export default class ReportEventDialog extends React.Component<IProps, IState> {
     // If the room supports moderation, the moderation information.
     private moderation?: Moderation;

src/components/views/dialogs/RoomSettingsDialog.tsx

@@ -30,7 +30,6 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";
 import SettingsStore from "../../../settings/SettingsStore";
 import { UIFeature } from "../../../settings/UIFeature";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import { Action } from '../../../dispatcher/actions';
 
@@ -51,7 +50,6 @@ interface IState {
     roomName: string;
 }
 
-@replaceableComponent("views.dialogs.RoomSettingsDialog")
 export default class RoomSettingsDialog extends React.Component<IProps, IState> {
     private dispatcherRef: string;
 

src/components/views/dialogs/RoomUpgradeDialog.tsx

@@ -19,7 +19,6 @@ import { Room } from "matrix-js-sdk/src/models/room";
 
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { upgradeRoom } from "../../../utils/RoomUpgrade";
 import { IDialogProps } from "./IDialogProps";
 import BaseDialog from "./BaseDialog";
@@ -35,7 +34,6 @@ interface IState {
     busy: boolean;
 }
 
-@replaceableComponent("views.dialogs.RoomUpgradeDialog")
 export default class RoomUpgradeDialog extends React.Component<IProps, IState> {
     private targetVersion: string;
 

src/components/views/dialogs/RoomUpgradeWarningDialog.tsx

@@ -23,7 +23,6 @@ import SdkConfig from "../../../SdkConfig";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Modal from "../../../Modal";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IDialogProps } from "./IDialogProps";
 import BugReportDialog from './BugReportDialog';
 import BaseDialog from "./BaseDialog";
@@ -50,7 +49,6 @@ interface IState {
     total?: number;
 }
 
-@replaceableComponent("views.dialogs.RoomUpgradeWarningDialog")
 export default class RoomUpgradeWarningDialog extends React.Component<IProps, IState> {
     private readonly isPrivate: boolean;
     private readonly currentVersion: string;

src/components/views/dialogs/ServerOfflineDialog.tsx

@@ -29,12 +29,10 @@ import AccessibleButton from "../elements/AccessibleButton";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { IDialogProps } from "./IDialogProps";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends IDialogProps {
 }
 
-@replaceableComponent("views.dialogs.ServerOfflineDialog")
 export default class ServerOfflineDialog extends React.PureComponent<IProps> {
     public componentDidMount() {
         EchoStore.instance.on(UPDATE_EVENT, this.onEchosUpdated);

src/components/views/dialogs/ServerPickerDialog.tsx

@@ -27,7 +27,6 @@ import Field from "../elements/Field";
 import StyledRadioButton from "../elements/StyledRadioButton";
 import TextWithTooltip from "../elements/TextWithTooltip";
 import withValidation, { IFieldState } from "../elements/Validation";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     title?: string;
@@ -40,7 +39,6 @@ interface IState {
     otherHomeserver: string;
 }
 
-@replaceableComponent("views.dialogs.ServerPickerDialog")
 export default class ServerPickerDialog extends React.PureComponent<IProps, IState> {
     private readonly defaultServer: ValidatedServerConfig;
     private readonly fieldRef = createRef<Field>();

src/components/views/dialogs/SeshatResetDialog.tsx

@@ -17,12 +17,10 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import { IDialogProps } from "./IDialogProps";
 
-@replaceableComponent("views.dialogs.SeshatResetDialog")
 export default class SeshatResetDialog extends React.PureComponent<IDialogProps> {
     render() {
         return (

src/components/views/dialogs/SessionRestoreErrorDialog.tsx

@@ -21,7 +21,6 @@ import React from 'react';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import QuestionDialog from "./QuestionDialog";
 import BugReportDialog from "./BugReportDialog";
 import BaseDialog from "./BaseDialog";
@@ -32,7 +31,6 @@ interface IProps extends IDialogProps {
     error: Error;
 }
 
-@replaceableComponent("views.dialogs.SessionRestoreErrorDialog")
 export default class SessionRestoreErrorDialog extends React.Component<IProps> {
     private sendBugReport = (): void => {
         Modal.createTrackedDialog('Session Restore Error', 'Send Bug Report Dialog', BugReportDialog, {

src/components/views/dialogs/SetEmailDialog.tsx

@@ -22,7 +22,6 @@ import * as Email from '../../../email';
 import AddThreepid from '../../../AddThreepid';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Spinner from "../elements/Spinner";
 import ErrorDialog from "./ErrorDialog";
 import QuestionDialog from "./QuestionDialog";
@@ -44,7 +43,6 @@ interface IState {
  *
  * On success, `onFinished(true)` is called.
  */
-@replaceableComponent("views.dialogs.SetEmailDialog")
 export default class SetEmailDialog extends React.Component<IProps, IState> {
     private addThreepid: AddThreepid;
 

src/components/views/dialogs/ShareDialog.tsx

@@ -29,7 +29,6 @@ import StyledCheckbox from '../elements/StyledCheckbox';
 import { IDialogProps } from "./IDialogProps";
 import SettingsStore from "../../../settings/SettingsStore";
 import { UIFeature } from "../../../settings/UIFeature";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import CopyableText from "../elements/CopyableText";
 
@@ -71,7 +70,6 @@ interface IState {
     permalinkCreator: RoomPermalinkCreator;
 }
 
-@replaceableComponent("views.dialogs.ShareDialog")
 export default class ShareDialog extends React.PureComponent<IProps, IState> {
     protected closeCopiedTooltip: () => void;
 

src/components/views/dialogs/StorageEvictedDialog.tsx

@@ -19,7 +19,6 @@ import React from 'react';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import BugReportDialog from "./BugReportDialog";
@@ -28,7 +27,6 @@ import AccessibleButton from '../elements/AccessibleButton';
 
 interface IProps extends IDialogProps { }
 
-@replaceableComponent("views.dialogs.StorageEvictedDialog")
 export default class StorageEvictedDialog extends React.Component<IProps> {
     private sendBugReport = (ev: React.MouseEvent): void => {
         ev.preventDefault();

src/components/views/dialogs/TabbedIntegrationManagerDialog.tsx

@@ -22,7 +22,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
 import { dialogTermsInteractionCallback, TermsNotSignedError } from "../../../Terms";
 import * as ScalarMessaging from "../../../ScalarMessaging";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IntegrationManagerInstance } from "../../../integrations/IntegrationManagerInstance";
 import ScalarAuthClient from "../../../ScalarAuthClient";
 import AccessibleButton from "../elements/AccessibleButton";
@@ -55,7 +54,6 @@ interface IState {
     currentScalarClient: ScalarAuthClient;
 }
 
-@replaceableComponent("views.dialogs.TabbedIntegrationManagerDialog")
 export default class TabbedIntegrationManagerDialog extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/views/dialogs/TermsDialog.tsx

@@ -19,7 +19,6 @@ import React from 'react';
 import { SERVICE_TYPES } from "matrix-js-sdk/src/service-types";
 
 import { _t, pickBestLanguage } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import DialogButtons from "../elements/DialogButtons";
 import BaseDialog from "./BaseDialog";
 
@@ -66,7 +65,6 @@ interface IState {
     agreedUrls: any;
 }
 
-@replaceableComponent("views.dialogs.TermsDialog")
 export default class TermsDialog extends React.PureComponent<ITermsDialogProps, IState> {
     constructor(props) {
         super(props);

src/components/views/dialogs/TextInputDialog.tsx

@@ -18,7 +18,6 @@ import React, { ChangeEvent, createRef } from 'react';
 
 import Field from "../elements/Field";
 import { _t, _td } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IFieldState, IValidationResult } from "../elements/Validation";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
@@ -43,7 +42,6 @@ interface IState {
     valid: boolean;
 }
 
-@replaceableComponent("views.dialogs.TextInputDialog")
 export default class TextInputDialog extends React.Component<IProps, IState> {
     private field = createRef<Field>();
 

src/components/views/dialogs/UploadConfirmDialog.tsx

@@ -19,7 +19,6 @@ import React from 'react';
 import filesize from "filesize";
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { getBlobSafeMimeType } from '../../../utils/blobs';
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
@@ -31,7 +30,6 @@ interface IProps {
     onFinished: (uploadConfirmed: boolean, uploadAll?: boolean) => void;
 }
 
-@replaceableComponent("views.dialogs.UploadConfirmDialog")
 export default class UploadConfirmDialog extends React.Component<IProps> {
     private readonly objectUrl: string;
     private readonly mimeType: string;

src/components/views/dialogs/UploadFailureDialog.tsx

@@ -19,7 +19,6 @@ import React from 'react';
 
 import { _t } from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import { IDialogProps } from "./IDialogProps";
@@ -35,7 +34,6 @@ interface IProps extends IDialogProps {
  * them. This is named fairly generically but the only thing we check right now is
  * the size of the file.
  */
-@replaceableComponent("views.dialogs.UploadFailureDialog")
 export default class UploadFailureDialog extends React.Component<IProps> {
     private onCancelClick = (): void => {
         this.props.onFinished(false);

src/components/views/dialogs/UserSettingsDialog.tsx

@@ -31,7 +31,6 @@ import HelpUserSettingsTab from "../settings/tabs/user/HelpUserSettingsTab";
 import SdkConfig from "../../../SdkConfig";
 import MjolnirUserSettingsTab from "../settings/tabs/user/MjolnirUserSettingsTab";
 import { UIFeature } from "../../../settings/UIFeature";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import { IDialogProps } from "./IDialogProps";
 import SidebarUserSettingsTab from "../settings/tabs/user/SidebarUserSettingsTab";
@@ -59,7 +58,6 @@ interface IState {
     mjolnirEnabled: boolean;
 }
 
-@replaceableComponent("views.dialogs.UserSettingsDialog")
 export default class UserSettingsDialog extends React.Component<IProps, IState> {
     private mjolnirWatcher: string;
 

src/components/views/dialogs/VerificationRequestDialog.tsx

@@ -20,7 +20,6 @@ import { User } from 'matrix-js-sdk/src/models/user';
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 import EncryptionPanel from "../right_panel/EncryptionPanel";
 
@@ -35,7 +34,6 @@ interface IState {
     verificationRequest: VerificationRequest;
 }
 
-@replaceableComponent("views.dialogs.VerificationRequestDialog")
 export default class VerificationRequestDialog extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);

src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx

@@ -32,7 +32,6 @@ import StyledCheckbox from "../elements/StyledCheckbox";
 import DialogButtons from "../elements/DialogButtons";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { CapabilityText } from "../../../widgets/CapabilityText";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends IDialogProps {
     requestedCapabilities: Set<Capability>;
@@ -50,7 +49,6 @@ interface IState {
     rememberSelection: boolean;
 }
 
-@replaceableComponent("views.dialogs.WidgetCapabilitiesPromptDialog")
 export default class WidgetCapabilitiesPromptDialog extends React.PureComponent<IProps, IState> {
     private eventPermissionsMap = new Map<Capability, WidgetEventCapability>();
 

src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx

@@ -22,7 +22,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { _t } from "../../../languageHandler";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { OIDCState, WidgetPermissionStore } from "../../../stores/widgets/WidgetPermissionStore";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IDialogProps } from "./IDialogProps";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
@@ -37,7 +36,6 @@ interface IState {
     rememberSelection: boolean;
 }
 
-@replaceableComponent("views.dialogs.WidgetOpenIDPermissionsDialog")
 export default class WidgetOpenIDPermissionsDialog extends React.PureComponent<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 
 import { _t } from "../../../../languageHandler";
-import { replaceableComponent } from "../../../../utils/replaceableComponent";
 import BaseDialog from "../BaseDialog";
 import DialogButtons from "../../elements/DialogButtons";
 
@@ -25,7 +24,6 @@ interface IProps {
     onFinished: (success: boolean) => void;
 }
 
-@replaceableComponent("views.dialogs.security.ConfirmDestroyCrossSigningDialog")
 export default class ConfirmDestroyCrossSigningDialog extends React.Component<IProps> {
     private onConfirm = (): void => {
         this.props.onFinished(true);

src/components/views/dialogs/security/CreateCrossSigningDialog.tsx

@@ -27,7 +27,6 @@ import DialogButtons from '../../elements/DialogButtons';
 import BaseDialog from '../BaseDialog';
 import Spinner from '../../elements/Spinner';
 import InteractiveAuthDialog from '../InteractiveAuthDialog';
-import { replaceableComponent } from "../../../../utils/replaceableComponent";
 
 interface IProps {
     accountPassword?: string;
@@ -46,7 +45,6 @@ interface IState {
  * cases, only a spinner is shown, but for more complex auth like SSO, the user
  * may need to complete some steps to proceed.
  */
-@replaceableComponent("views.dialogs.security.CreateCrossSigningDialog")
 export default class CreateCrossSigningDialog extends React.PureComponent<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/views/dialogs/security/SetupEncryptionDialog.tsx

@@ -20,7 +20,6 @@ import SetupEncryptionBody from '../../../structures/auth/SetupEncryptionBody';
 import BaseDialog from '../BaseDialog';
 import { _t } from '../../../../languageHandler';
 import { SetupEncryptionStore, Phase } from '../../../../stores/SetupEncryptionStore';
-import { replaceableComponent } from "../../../../utils/replaceableComponent";
 import { IDialogProps } from "../IDialogProps";
 
 function iconFromPhase(phase: Phase) {
@@ -36,7 +35,6 @@ interface IState {
     icon: string;
 }
 
-@replaceableComponent("views.dialogs.security.SetupEncryptionDialog")
 export default class SetupEncryptionDialog extends React.Component<IProps, IState> {
     private store: SetupEncryptionStore;
 

src/components/views/elements/AccessibleTooltipButton.tsx

@@ -19,7 +19,6 @@ import React, { SyntheticEvent } from 'react';
 
 import AccessibleButton from "./AccessibleButton";
 import Tooltip, { Alignment } from './Tooltip';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps extends React.ComponentProps<typeof AccessibleButton> {
     title: string;
@@ -36,7 +35,6 @@ interface IState {
     hover: boolean;
 }
 
-@replaceableComponent("views.elements.AccessibleTooltipButton")
 export default class AccessibleTooltipButton extends React.PureComponent<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/views/elements/ActionButton.tsx

@@ -19,7 +19,6 @@ import React from 'react';
 import AccessibleButton from './AccessibleButton';
 import dis from '../../../dispatcher/dispatcher';
 import Analytics from '../../../Analytics';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Tooltip from './Tooltip';
 
 interface IProps {
@@ -37,7 +36,6 @@ interface IState {
     showTooltip: boolean;
 }
 
-@replaceableComponent("views.elements.ActionButton")
 export default class ActionButton extends React.Component<IProps, IState> {
     static defaultProps: Partial<IProps> = {
         size: "25",

src/components/views/elements/AddressSelector.tsx

@@ -18,7 +18,6 @@ limitations under the License.
 import React, { createRef } from 'react';
 import classNames from 'classnames';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IUserAddress } from '../../../UserAddress';
 import AddressTile from './AddressTile';
 
@@ -41,7 +40,6 @@ interface IState {
     hover: boolean;
 }
 
-@replaceableComponent("views.elements.AddressSelector")
 export default class AddressSelector extends React.Component<IProps, IState> {
     private scrollElement = createRef<HTMLDivElement>();
     private addressListElement = createRef<HTMLDivElement>();

src/components/views/elements/AddressTile.tsx

@@ -19,7 +19,6 @@ import React from 'react';
 import classNames from 'classnames';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import { IUserAddress } from '../../../UserAddress';
 import BaseAvatar from '../avatars/BaseAvatar';
@@ -33,7 +32,6 @@ interface IProps {
     showAddress?: boolean;
 }
 
-@replaceableComponent("views.elements.AddressTile")
 export default class AddressTile extends React.Component<IProps> {
     static defaultProps: Partial<IProps> = {
         canDismiss: false,

src/components/views/elements/AppPermission.tsx

@@ -24,7 +24,6 @@ import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import WidgetUtils from "../../../utils/WidgetUtils";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import MemberAvatar from '../avatars/MemberAvatar';
 import BaseAvatar from '../avatars/BaseAvatar';
 import AccessibleButton from './AccessibleButton';
@@ -44,7 +43,6 @@ interface IState {
     widgetDomain: string;
 }
 
-@replaceableComponent("views.elements.AppPermission")
 export default class AppPermission extends React.Component<IProps, IState> {
     static defaultProps: Partial<IProps> = {
         onPermissionGranted: () => {},

src/components/views/elements/AppTile.tsx

@@ -39,7 +39,6 @@ import { StopGapWidget } from "../../../stores/widgets/StopGapWidget";
 import { ElementWidgetActions } from "../../../stores/widgets/ElementWidgetActions";
 import WidgetContextMenu from "../context_menus/WidgetContextMenu";
 import WidgetAvatar from "../avatars/WidgetAvatar";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import CallHandler from '../../../CallHandler';
 import { IApp } from "../../../stores/WidgetStore";
 import { Container, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
@@ -101,7 +100,6 @@ interface IState {
     requiresClient: boolean;
 }
 
-@replaceableComponent("views.elements.AppTile")
 export default class AppTile extends React.Component<IProps, IState> {
     public static contextType = MatrixClientContext;
     context: ContextType<typeof MatrixClientContext>;

src/components/views/elements/DesktopCapturerSourcePicker.tsx

@@ -21,7 +21,6 @@ import { _t } from '../../../languageHandler';
 import BaseDialog from "..//dialogs/BaseDialog";
 import DialogButtons from "./DialogButtons";
 import AccessibleButton from './AccessibleButton';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import TabbedView, { Tab, TabLocation } from '../../structures/TabbedView';
 import PlatformPeg from "../../../PlatformPeg";
 
@@ -90,7 +89,6 @@ export interface PickerIProps {
     onFinished(sourceId: string): void;
 }
 
-@replaceableComponent("views.elements.DesktopCapturerSourcePicker")
 export default class DesktopCapturerSourcePicker extends React.Component<
     PickerIProps,
     PickerIState

src/components/views/elements/DialogButtons.tsx

@@ -19,7 +19,6 @@ limitations under the License.
 import React from "react";
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // The primary button which is styled differently and has default focus.
@@ -61,7 +60,6 @@ interface IProps {
 /**
  * Basic container for buttons in modal dialogs.
  */
-@replaceableComponent("views.elements.DialogButtons")
 export default class DialogButtons extends React.Component<IProps> {
     public static defaultProps: Partial<IProps> = {
         hasCancel: true,

src/components/views/elements/DirectorySearchBox.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React, { ChangeEvent, createRef } from 'react';
 
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import AccessibleButton from "./AccessibleButton";
 
 interface IProps {
@@ -34,7 +33,6 @@ interface IState {
     value: string;
 }
 
-@replaceableComponent("views.elements.DirectorySearchBox")
 export default class DirectorySearchBox extends React.Component<IProps, IState> {
     private input = createRef<HTMLInputElement>();
 

src/components/views/elements/Draggable.tsx

@@ -16,8 +16,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 interface IProps {
     className: string;
     dragFunc: (currentLocation: ILocationState, event: MouseEvent) => ILocationState;
@@ -35,7 +33,6 @@ export interface ILocationState {
     currentY: number;
 }
 
-@replaceableComponent("views.elements.Draggable")
 export default class Draggable extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/views/elements/Dropdown.tsx

@@ -20,7 +20,6 @@ import classnames from 'classnames';
 
 import AccessibleButton, { ButtonEvent } from './AccessibleButton';
 import { _t } from '../../../languageHandler';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 
@@ -107,7 +106,6 @@ interface IState {
  * but somewhat simpler as react-select is 79KB of minified
  * javascript.
  */
-@replaceableComponent("views.elements.Dropdown")
 export default class Dropdown extends React.Component<IProps, IState> {
     private readonly buttonRef = createRef<HTMLDivElement>();
     private dropdownRootElement: HTMLDivElement = null;

src/components/views/elements/EditableItemList.tsx

@@ -19,7 +19,6 @@ import React from "react";
 import { _t } from '../../../languageHandler';
 import Field from "./Field";
 import AccessibleButton from "./AccessibleButton";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IItemProps {
     index?: number;
@@ -107,7 +106,6 @@ interface IProps {
     onNewItemChanged?(item: string): void;
 }
 
-@replaceableComponent("views.elements.EditableItemList")
 export default class EditableItemList<P = {}> extends React.PureComponent<IProps & P> {
     protected onItemAdded = (e) => {
         e.stopPropagation();

src/components/views/elements/EditableText.tsx

@@ -19,7 +19,6 @@ import React, { createRef } from 'react';
 
 import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 enum Phases {
     Display = "display",
@@ -45,7 +44,6 @@ interface IState {
     phase: Phases;
 }
 
-@replaceableComponent("views.elements.EditableText")
 export default class EditableText extends React.Component<IProps, IState> {
     // we track value as an JS object field rather than in React state
     // as React doesn't play nice with contentEditable.

src/components/views/elements/EditableTextContainer.tsx

@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from 'react';
 
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Spinner from "./Spinner";
 import EditableText from "./EditableText";
 
@@ -56,7 +55,6 @@ interface IState {
  * similarly asynchronous way. If this is not provided, the initial value is
  * taken from the 'initialValue' property.
  */
-@replaceableComponent("views.elements.EditableTextContainer")
 export default class EditableTextContainer extends React.Component<IProps, IState> {
     private unmounted = false;
     public static defaultProps: Partial<IProps> = {

src/components/views/elements/ErrorBoundary.tsx

@@ -22,7 +22,6 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import PlatformPeg from '../../../PlatformPeg';
 import Modal from '../../../Modal';
 import SdkConfig from "../../../SdkConfig";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BugReportDialog from '../dialogs/BugReportDialog';
 import AccessibleButton from './AccessibleButton';
 
@@ -34,7 +33,6 @@ interface IState {
  * This error boundary component can be used to wrap large content areas and
  * catch exceptions during rendering in the component tree below them.
  */
-@replaceableComponent("views.elements.ErrorBoundary")
 export default class ErrorBoundary extends React.PureComponent<{}, IState> {
     constructor(props) {
         super(props);

src/components/views/elements/EventListSummary.tsx

@@ -25,7 +25,6 @@ import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
 import { isValid3pidInvite } from "../../../RoomInvite";
 import GenericEventListSummary from "./GenericEventListSummary";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { RightPanelPhases } from '../../../stores/right-panel/RightPanelStorePhases';
 import { jsxJoin } from '../../../utils/ReactUtils';
 import { Layout } from '../../../settings/enums/Layout';
@@ -79,7 +78,6 @@ enum TransitionType {
 
 const SEP = ",";
 
-@replaceableComponent("views.elements.EventListSummary")
 export default class EventListSummary extends React.Component<IProps> {
     static contextType = RoomContext;
     public context!: React.ContextType<typeof RoomContext>;

src/components/views/elements/EventTilePreview.tsx

@@ -22,7 +22,6 @@ import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
 import * as Avatar from '../../../Avatar';
 import EventTile from '../rooms/EventTile';
 import { Layout } from "../../../settings/enums/Layout";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import Spinner from './Spinner';
 
 interface IProps {
@@ -63,7 +62,6 @@ interface IState {
 
 const AVATAR_SIZE = 32;
 
-@replaceableComponent("views.elements.EventTilePreview")
 export default class EventTilePreview extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/views/elements/IRCTimelineProfileResizer.tsx

@@ -19,7 +19,6 @@ import React from 'react';
 import SettingsStore from "../../../settings/SettingsStore";
 import Draggable, { ILocationState } from './Draggable';
 import { SettingLevel } from "../../../settings/SettingLevel";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     // Current room
@@ -33,7 +32,6 @@ interface IState {
     IRCLayoutRoot: HTMLElement;
 }
 
-@replaceableComponent("views.elements.IRCTimelineProfileResizer")
 export default class IRCTimelineProfileResizer extends React.Component<IProps, IState> {
     constructor(props: IProps) {
         super(props);

src/components/views/elements/ImageView.tsx

@@ -31,7 +31,6 @@ import SettingsStore from "../../../settings/SettingsStore";
 import { formatFullDate } from "../../../DateUtils";
 import dis from '../../../dispatcher/dispatcher';
 import { Action } from '../../../dispatcher/actions';
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
 import { normalizeWheelEvent } from "../../../utils/Mouse";
 import { IDialogProps } from '../dialogs/IDialogProps';
@@ -90,7 +89,6 @@ interface IState {
     contextMenuDisplayed: boolean;
 }
 
-@replaceableComponent("views.elements.ImageView")
 export default class ImageView extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);

src/components/views/elements/InfoTooltip.tsx

@@ -20,7 +20,6 @@ import classNames from 'classnames';
 
 import { Alignment } from './Tooltip';
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import TooltipTarget from './TooltipTarget';
 
 export enum InfoTooltipKind {
@@ -35,7 +34,6 @@ interface ITooltipProps {
     kind?: InfoTooltipKind;
 }
 
-@replaceableComponent("views.elements.InfoTooltip")
 export default class InfoTooltip extends React.PureComponent<ITooltipProps> {
     constructor(props: ITooltipProps) {
         super(props);

src/components/views/elements/InlineSpinner.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     w?: number;
@@ -25,7 +24,6 @@ interface IProps {
     children?: React.ReactNode;
 }
 
-@replaceableComponent("views.elements.InlineSpinner")
 export default class InlineSpinner extends React.PureComponent<IProps> {
     static defaultProps = {
         w: 16,

src/components/views/elements/InviteReason.tsx

@@ -19,7 +19,6 @@ import React from "react";
 
 import { sanitizedHtmlNode } from "../../../HtmlUtils";
 import { _t } from "../../../languageHandler";
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
     reason: string;
@@ -30,7 +29,6 @@ interface IState {
     hidden: boolean;
 }
 
-@replaceableComponent("views.elements.InviteReason")
 export default class InviteReason extends React.PureComponent<IProps, IState> {
     constructor(props) {
         super(props);