Revert f8f11b08c5b27eeb4c8d842625ef9128c25da033,
5fa921cc4195a3a49d314520c73826db2b0ba3ee, and
b4da500d9cfd124a1e0484b87eeb3f51b73b96e9
first 2 cause issues with startup, last caused issues with text
duplication